diff --git a/lib/screens/repeater_hub_screen.dart b/lib/screens/repeater_hub_screen.dart
index 846d0c5d..903f89e6 100644
--- a/lib/screens/repeater_hub_screen.dart
+++ b/lib/screens/repeater_hub_screen.dart
@@ -73,7 +73,7 @@ class RepeaterHubScreen extends StatelessWidget {
                     ),
                     const SizedBox(height: 8),
                     Text(
-                      '$repeater.shortPubKeyHex',
+                      repeater.shortPubKeyHex,
                       style: TextStyle(fontSize: 14, color: Colors.grey[600]),
                     ),
                     const SizedBox(height: 8),
diff --git a/lib/widgets/repeater_login_dialog.dart b/lib/widgets/repeater_login_dialog.dart
index 54c01504..1f767f6c 100644
--- a/lib/widgets/repeater_login_dialog.dart
+++ b/lib/widgets/repeater_login_dialog.dart
@@ -322,7 +322,9 @@ class _RepeaterLoginDialogState extends State<RepeaterLoginDialog> {
                     }
                   },
                   onSubmitted: (_) => _handleLogin(),
-                  autofocus: _passwordController.text.isEmpty,
+                  autofocus: !(defaultTargetPlatform == TargetPlatform.android ||
+                      defaultTargetPlatform == TargetPlatform.iOS) &&
+                     _passwordController.text.isEmpty,
                 ),
                 const SizedBox(height: 12),
                 CheckboxListTile(
diff --git a/lib/widgets/room_login_dialog.dart b/lib/widgets/room_login_dialog.dart
index 69f8dc66..1d2554df 100644
--- a/lib/widgets/room_login_dialog.dart
+++ b/lib/widgets/room_login_dialog.dart
@@ -293,7 +293,9 @@ class _RoomLoginDialogState extends State<RoomLoginDialog> {
                     ),
                   ),
                   onSubmitted: (_) => _handleLogin(),
-                  //autofocus: _passwordController.text.isEmpty,
+                  autofocus: !(defaultTargetPlatform == TargetPlatform.android ||
+                      defaultTargetPlatform == TargetPlatform.iOS) &&
+                     _passwordController.text.isEmpty,
                 ),
                 const SizedBox(height: 12),
                 CheckboxListTile(