diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 80831d35f..cc9384821 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -343,7 +343,7 @@ public class PgpKeyOperation {
         updateProgress(R.string.progress_done, 100, 100);
     }
 
-    public void buildSecretKey(ArrayList<String> userIds, ArrayList<String> OriginalIDs, ArrayList<String> deletedIDs, ArrayList<PGPSecretKey> keys, boolean[] modded_keys, ArrayList<PGPSecretKey> deleted_keys, ArrayList<GregorianCalendar> keysExpiryDates, ArrayList<Integer> keysUsages, String newPassPhrase, String oldPassPhrase) throws PgpGeneralException,
+    public void buildSecretKey(ArrayList<String> userIds, ArrayList<String> OriginalIDs, ArrayList<String> deletedIDs, boolean primaryIDChanged, boolean[] modded_keys, ArrayList<PGPSecretKey> deleted_keys, ArrayList<GregorianCalendar> keysExpiryDates, ArrayList<Integer> keysUsages, String newPassPhrase, String oldPassPhrase, ArrayList<PGPSecretKey> keys) throws PgpGeneralException,
             PGPException, SignatureException, IOException {
 
         updateProgress(R.string.progress_building_key, 0, 100);
@@ -386,7 +386,7 @@ public class PgpKeyOperation {
 
                 PGPSignature certification = sGen.generateCertification(userId, masterPublicKey);
 
-                masterPublicKey = PGPPublicKey.removeCertification();
+                //masterPublicKey = PGPPublicKey.removeCertification();
                 masterPublicKey = PGPPublicKey.addCertification(masterPublicKey, userId, certification);
             }
             user_id_index++;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 9e517b93e..73de7ca6e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -128,6 +128,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
     public static final String SAVE_KEYRING_NEW_PASSPHRASE = "new_passphrase";
     public static final String SAVE_KEYRING_CURRENT_PASSPHRASE = "current_passphrase";
     public static final String SAVE_KEYRING_USER_IDS = "user_ids";
+    public static final String SAVE_KEYRING_PRIMARY_ID_CHANGED = "primary_id_changed";
     public static final String SAVE_KEYRING_KEYS = "keys";
     public static final String SAVE_KEYRING_KEYS_USAGES = "keys_usages";
     public static final String SAVE_KEYRING_KEYS_EXPIRY_DATES = "keys_expiry_dates";
@@ -549,6 +550,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
                 boolean[] modded_keys = data.getBooleanArray(SAVE_KEYRING_MODDED_KEYS);
                 ArrayList<PGPSecretKey> deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(data
                         .getByteArray(SAVE_KEYRING_DELETED_KEYS));
+                boolean primaryChanged = data.getBoolean(SAVE_KEYRING_PRIMARY_ID_CHANGED);
 
                 long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID);
 
@@ -559,8 +561,9 @@ public class KeychainIntentService extends IntentService implements ProgressDial
                             ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId),
                             oldPassPhrase, newPassPhrase);
                 } else {
-                    keyOperations.buildSecretKey(userIds, original_ids, deleted_ids, keys, modded_keys,
-                            deletedKeys, keysExpiryDates, keysUsages, newPassPhrase, oldPassPhrase);
+                    keyOperations.buildSecretKey(userIds, original_ids, deleted_ids, primaryChanged,
+                            modded_keys, deletedKeys, keysExpiryDates, keysUsages, newPassPhrase,
+                            oldPassPhrase, keys);
                 }
                 PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase);
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index ec7dd1330..09be0dc79 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -595,6 +595,8 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
                     mUserIdsView.getOriginalIDs());
             data.putBooleanArray(KeychainIntentService.SAVE_KEYRING_MODDED_KEYS,
                     toPrimitiveArray(mKeysView.getNeedsSavingArray()));
+            data.putBoolean(KeychainIntentService.SAVE_KEYRING_PRIMARY_ID_CHANGED,
+                    mUserIdsView.primaryChanged());
 
             intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 2e06f3f34..014a891a5 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -169,6 +169,19 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         for (int i = 0; i < mEditors.getChildCount(); ++i) {
             Editor editor = (Editor) mEditors.getChildAt(i);
             ret |= editor.needsSaving();
+            if (mType == Id.type.user_id)
+                ret |= ((UserIdEditor)editor).primarySwapped();
+        }
+        return ret;
+    }
+
+    public boolean primaryChanged()
+    {
+        boolean ret = false;
+        for (int i = 0; i < mEditors.getChildCount(); ++i) {
+            Editor editor = (Editor) mEditors.getChildAt(i);
+            if (mType == Id.type.user_id)
+                ret |= ((UserIdEditor)editor).primarySwapped();
         }
         return ret;
     }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 37ab0e051..5098c8713 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -221,7 +221,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
 
     @Override
     public boolean needsSaving() {
-        boolean retval = (mOriginallyMainUserID != isMainUserId());
+        boolean retval = false; //(mOriginallyMainUserID != isMainUserId());
         retval |= !(mOriginalName.equals( ("" + mName.getText()).trim() ) );
         retval |= !(mOriginalEmail.equals( ("" + mEmail.getText()).trim() ) );
         retval |= !(mOriginalComment.equals( ("" + mComment.getText()).trim() ) );
@@ -229,6 +229,11 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
         return retval;
     }
 
+    public boolean primarySwapped()
+    {
+        return (mOriginallyMainUserID != isMainUserId());
+    }
+
     public String getOriginalID()
     {
         return mOriginalID;