diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 61b7dac8e..a8f2fe88b 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -2329,6 +2329,12 @@ static NSArray *reminderValues = nil;
           [v setObject: sanitizedLabels  forKey: @"SOGoMailLabelsColors"];
         }
 
+      //
+      // Keep the primary mail certificate
+      //
+      if ([[[user userDefaults] mailCertificate] length])
+        [v setObject: [[user userDefaults] mailCertificate]  forKey: @"SOGoMailCertificate"];
+
       //
       // We sanitize our auxilary mail accounts
       //