diff --git a/MainForm.cs b/MainForm.cs
index 99f8f46..0091add 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -367,6 +367,9 @@ namespace MeshCentralRouter
                     catch (Exception) { }
                 }
             }
+
+            // Set the focus
+            if (userNameTextBox.Text != "") { passwordTextBox.Select(); }
         }
 
         bool isPointVisibleOnAScreen(Point p)