diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index da3158129..1a5367fd5 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -259,8 +259,13 @@ public class PgpEngine {
 							account);
 					return;
 				case OpenPgpApi.RESULT_CODE_ERROR:
-					logError(account, (OpenPgpError) result.getParcelableExtra(OpenPgpApi.RESULT_ERROR));
-					callback.error(R.string.unable_to_connect_to_keychain, account);
+					OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR);
+					if (error != null && "signing subkey not found!".equals(error.getMessage())) {
+						callback.error(0,account);
+					} else {
+						logError(account, error);
+						callback.error(R.string.unable_to_connect_to_keychain, null);
+					}
                 }
 			}
 		});
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 5172e18d7..c2dfa1d8e 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -584,7 +584,14 @@ public abstract class XmppActivity extends Activity {
 
 				@Override
 				public void error(int error, Account account) {
-					displayErrorDialog(error);
+					if (error == 0 && account != null) {
+						account.setPgpSignId(0);
+						account.unsetPgpSignature();
+						xmppConnectionService.databaseBackend.updateAccount(account);
+						choosePgpSignId(account);
+					} else {
+						displayErrorDialog(error);
+					}
 				}
 			});
 		}