diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
index a321944..3b2b8a6 100644
--- a/lib/pages/login_page.dart
+++ b/lib/pages/login_page.dart
@@ -81,6 +81,14 @@ class LoginPage extends HookConsumerWidget {
               },
               decoration: InputDecoration(
                 label: Text("Username"),
+                focusedBorder: OutlineInputBorder(
+                  borderSide: BorderSide(
+                    width: hasError.value ? 4 : 2,
+                    color: hasError.value
+                        ? theme.colorScheme.error
+                        : theme.colorScheme.primary,
+                  ),
+                ),
                 enabledBorder: OutlineInputBorder(
                   borderSide: BorderSide(
                     width: hasError.value ? 4 : 2,
diff --git a/lib/pages/select_server_page.dart b/lib/pages/select_server_page.dart
index c9f4f37..8a8ac9f 100644
--- a/lib/pages/select_server_page.dart
+++ b/lib/pages/select_server_page.dart
@@ -49,19 +49,14 @@ class SelectServerPage extends HookConsumerWidget {
           );
         } else {
           homeserverUrl.text = newHomeserver!.origin;
-          Navigator.push(
-            context,
-            MaterialPageRoute(
-              builder: (_) => LoginPage(homeserver: Uri.parse(newUrl)),
-            ),
+          await Navigator.of(context).push(
+            MaterialPageRoute(builder: (_) => LoginPage(homeserver: newUrl)),
           );
         }
       }
 
-      if (context.mounted) {
-        homeserverFocusNode.requestFocus();
-        isLoading.value = false;
-      }
+      homeserverFocusNode.requestFocus();
+      isLoading.value = false;
     }
 
     return Scaffold(