diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index a0221fec..e4beeb49 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/src/gui/src/ActivationDialog.cpp
@@ -68,6 +68,8 @@ void ActivationDialog::reject()
 	CancelActivationDialog cancelActivationDialog(this);
 	if (QDialog::Accepted == cancelActivationDialog.exec()) {
 		notifyActivation("skip:unknown");
+		m_appConfig->activationHasRun(true);
+		m_appConfig->saveSettings();
 		QDialog::reject();
 	}
 }
@@ -102,6 +104,9 @@ void ActivationDialog::accept()
 	QString error;
 	int edition = Unregistered;
 
+	m_appConfig->activationHasRun(true);
+	m_appConfig->saveSettings();
+
 	try {
 		if (ui->m_pRadioButtonActivate->isChecked()) {
 			WebClient webClient;
@@ -152,7 +157,6 @@ void ActivationDialog::accept()
 	}
 
 	m_appConfig->setEdition(edition);
-	m_appConfig->activationHasRun(true);
 	m_appConfig->saveSettings();
 
 	message.information  (this, "Activated!",