diff --git a/launcher/ui/Pages/LoginPage.qml b/launcher/ui/Pages/LoginPage.qml
index 460cbb7..dcc3ebc 100644
--- a/launcher/ui/Pages/LoginPage.qml
+++ b/launcher/ui/Pages/LoginPage.qml
@@ -213,7 +213,7 @@ QQC2.Control {
 
             FormCard.FormDelegateSeparator {
                 above: passwordField
-                below: otpField
+                below: LauncherCore.currentProfile.account.useOTP ? otpField : loginButton
             }
 
             FormCard.FormTextFieldDelegate {
@@ -228,8 +228,9 @@ QQC2.Control {
             }
 
             FormCard.FormDelegateSeparator {
-                above: otpField
+                above: LauncherCore.currentProfile.account.useOTP ? otpField : passwordField
                 below: loginButton
+                visible: LauncherCore.currentProfile.account.useOTP
             }
 
             FormCard.FormButtonDelegate {
@@ -274,6 +275,8 @@ QQC2.Control {
             }
 
             FormCard.FormDelegateSeparator {
+                above: serverStatusButton
+                below: settingsButton
             }
 
             FormCard.FormButtonDelegate {