diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index d900f5a71..bfc7434b2 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -19,8 +19,8 @@
 <resources>
 
     <!-- title -->
-    <string name="title_manage_public_keys">Manage Public Keys</string>
-    <string name="title_manage_secret_keys">Manage Secret Keys</string>
+    <string name="title_manage_public_keys">Public Keys</string>
+    <string name="title_manage_secret_keys">Secret Keys</string>
     <string name="title_select_recipients">Select Public Key</string>
     <string name="title_select_secret_key">Select Secret Key</string>
     <string name="title_encrypt">Encrypt</string>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 7aeb51c8f..4dcaa6d73 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -295,17 +295,6 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     }
 
     private void finallyEdit(final long masterKeyId, final boolean masterCanSign) {
-        // TODO: ???
-        if (mCurrentPassPhrase == null) {
-            mCurrentPassPhrase = "";
-        }
-
-        if (mCurrentPassPhrase.equals("")) {
-            // check "no passphrase" checkbox and remove button
-            mNoPassphrase.setChecked(true);
-            mChangePassPhrase.setVisibility(View.GONE);
-        }
-
         if (masterKeyId != 0) {
             PGPSecretKey masterKey = null;
             mKeyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this, masterKeyId);
@@ -328,6 +317,17 @@ public class EditKeyActivity extends SherlockFragmentActivity {
         }
 
         buildLayout();
+
+        // TODO: ???
+        if (mCurrentPassPhrase == null) {
+            mCurrentPassPhrase = "";
+        }
+
+        if (mCurrentPassPhrase.equals("")) {
+            // check "no passphrase" checkbox and remove button
+            mNoPassphrase.setChecked(true);
+            mChangePassPhrase.setVisibility(View.GONE);
+        }
     }
 
     /**