diff --git a/launcher/ui/Pages/LoginPage.qml b/launcher/ui/Pages/LoginPage.qml
index 4ab5f3f..029b616 100644
--- a/launcher/ui/Pages/LoginPage.qml
+++ b/launcher/ui/Pages/LoginPage.qml
@@ -154,7 +154,13 @@ Controls.Control {
                     label: page.profile.account.isSapphire ? i18n("Password") : i18n("Square Enix Password")
                     echoMode: TextInput.Password
                     focus: true
-                    onAccepted: otpField.clicked()
+                    onAccepted: {
+                        if (otpField.visible) {
+                            otpField.clicked();
+                        } else {
+                            loginButton.clicked();
+                        }
+                    }
                     text: page.profile.account.rememberPassword ? "abcdefg" : ""
                 }
 
@@ -197,4 +203,6 @@ Controls.Control {
             }
         }
     }
+
+    Component.onCompleted: passwordField.forceActiveFocus()
 }
\ No newline at end of file