diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart
index ce6acb64..c3d306b1 100644
--- a/lib/views/sign_up_password.dart
+++ b/lib/views/sign_up_password.dart
@@ -20,6 +20,7 @@ class SignUpPassword extends StatefulWidget {
 class _SignUpPasswordState extends State<SignUpPassword> {
   final TextEditingController passwordController = TextEditingController();
   String passwordError;
+  String _lastAuthWebViewStage;
   bool loading = false;
   bool showPassword = true;
 
@@ -66,6 +67,12 @@ class _SignUpPasswordState extends State<SignUpPassword> {
             ),
           );
         } else {
+          if (_lastAuthWebViewStage == currentStage) {
+            setState(
+                () => passwordError = L10n.of(context).oopsSomethingWentWrong);
+            return setState(() => loading = false);
+          }
+          _lastAuthWebViewStage = currentStage;
           await AdaptivePageLayout.of(context).pushNamed(
             '/authwebview/$currentStage/${exception.session}',
             arguments: () => _signUpAction(