diff --git a/lib/pages/signup.dart b/lib/pages/signup.dart
index 744981d1..6836409a 100644
--- a/lib/pages/signup.dart
+++ b/lib/pages/signup.dart
@@ -101,7 +101,9 @@ class SignupPageController extends State<SignupPage> {
     } catch (e) {
       error = (e as Object).toLocalizedString(context);
     } finally {
-      setState(() => loading = false);
+      if (mounted) {
+        setState(() => loading = false);
+      }
     }
   }
 
diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index 1fcbf16b..dafab0a0 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -141,10 +141,7 @@ class HomeserverPickerView extends StatelessWidget {
                                     labelText: L10n.of(context).login,
                                   ),
                                 ),
-                              if (controller.registrationSupported &&
-                                  // Registration is broken on matrix.org
-                                  Matrix.of(context).client.homeserver.host !=
-                                      'matrix-client.matrix.org')
+                              if (controller.registrationSupported)
                                 Center(
                                   child: _LoginButton(
                                     onPressed: controller.signUpAction,