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 370f66388..9bf9ecc73 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
@@ -376,6 +376,9 @@ public class PgpKeyOperation {
             else
                 remove changed IDs and add in with new certs
 
+            if the master key changed, we need to remove the primary ID certification, so we can add
+            the new one when it is generated, and they don't conflict
+
         Keys
             remove deleted keys
             if a key is modified, re-sign it
@@ -495,6 +498,11 @@ public class PgpKeyOperation {
             }
         }
 
+        if (saveParcel.moddedKeys[0]) {
+            masterPublicKey = PGPPublicKey.removeCertification(masterPublicKey, saveParcel.originalIDs.get(0));
+            anyIDChanged = true;
+        }
+
         //update the keyring with the new ID information
         if (anyIDChanged) {
             pKR = PGPPublicKeyRing.insertPublicKey(pKR, masterPublicKey);