diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 4597c1ec0..f83e414da 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -39,6 +39,7 @@ import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.openintents.openpgp.AutocryptPeerUpdate;
@@ -719,7 +720,7 @@ public class OpenPgpService extends Service {
             String preferredUserId = data.getStringExtra(OpenPgpApi.EXTRA_USER_ID);
             PendingIntent pi;
             // the new dialog doesn't really work if we don't have a user id to work with. just show the old...
-            if (preferredUserId == null) {
+            if (TextUtils.isEmpty(preferredUserId)) {
                 pi = mApiPendingIntentFactory.createSelectSignKeyIdLegacyPendingIntent(data, currentPkg, null);
             } else {
                 byte[] packageSignature = mApiPermissionHelper.getPackageCertificateOrError(currentPkg);
diff --git a/OpenKeychain/src/main/res/layout/api_select_identity_key.xml b/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
index 1c1b3fc3f..489a7d5f4 100644
--- a/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
+++ b/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
@@ -78,7 +78,7 @@
         android:inAnimation="@anim/fade_in"
         android:outAnimation="@anim/fade_out"
         android:measureAllChildren="false"
-        custom:initialView="03">
+        custom:initialView="01">
 
         <Space
             android:layout_width="wrap_content"
@@ -202,7 +202,7 @@
                         style="?android:textAppearanceMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@android:string/cancel"
+                        android:text="@string/select_identity_cancel"
                         />
 
                 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 9565f4798..a27bd93d0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1992,7 +1992,7 @@
     <string name="use_key">Use key: %s</string>
     <string name="use_key_no_name">Use key: <![CDATA[<no name>]]></string>
     <string name="title_select_key">%s wants to set up end-to-end encryption for this address:</string>
-    <string name="select_identity_cancel">Cancel</string>
+    <string name="select_identity_cancel">Disable</string>
     <string name="select_identity_create">Create a key for me</string>
     <string name="error_save_key_internal">"Internal error saving key!"</string>
     <string name="menu_list_unrelated_keys">List unrelated keys</string>