diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 3b3cdb6936..7e50dce2dd 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -144,6 +144,9 @@ protected void onNextButtonClicked() {
         state++;
         if (state == 1) {
             init();
+        } else if (state == -1) {
+            setResult(RESULT_CANCELED);
+            finish();
         }
     }
 
@@ -305,11 +308,15 @@ public void onResponse(AuthResponse response) {
                             retrieveGmsToken(account);
                             setResult(RESULT_OK);
                         } else {
-                            showError(R.string.auth_general_error_desc);
                             Log.w(TAG, "Account NOT created!");
-                            setResult(RESULT_CANCELED);
-                            // TODO: Give the user a chance to read the message :)
-                            finish();
+                            runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    showError(R.string.auth_general_error_desc);
+                                    setNextButtonText(android.R.string.ok);
+                                }
+                            });
+                            state = -2;
                         }
                     }