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 d37a99c6..7a7bfacf 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
@@ -308,7 +308,12 @@ public class LoginActivity extends AssistantActivity {
 
                     @Override
                     public void onException(Exception exception) {
-                        Log.w(TAG, "onException: " + exception);
+                        Log.w(TAG, "onException", exception);
+                        runOnUiThread(() -> {
+                            showError(R.string.auth_general_error_desc);
+                            setNextButtonText(android.R.string.ok);
+                        });
+                        state = -2;
                     }
                 });
     }
@@ -339,7 +344,12 @@ public class LoginActivity extends AssistantActivity {
 
                     @Override
                     public void onException(Exception exception) {
-                        Log.w(TAG, "onException: " + exception);
+                        Log.w(TAG, "onException", exception);
+                        runOnUiThread(() -> {
+                            showError(R.string.auth_general_error_desc);
+                            setNextButtonText(android.R.string.ok);
+                        });
+                        state = -2;
                     }
                 });
     }
diff --git a/proguard.flags b/proguard.flags
index bc1febc5..6127c42e 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -33,6 +33,11 @@
     @org.microg.safeparcel.SafeParceled *;
 }
 
+# Keep form data
+-keepclassmembers class * {
+    @org.microg.gms.common.HttpFormClient$* *;
+}
+
 # Keep asInterface method cause it's accessed from SafeParcel
 -keepattributes InnerClasses
 -keepclassmembers interface * extends android.os.IInterface {