diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp
index 18df2925b..f58cdfdd4 100644
--- a/src/widget/loginscreen.cpp
+++ b/src/widget/loginscreen.cpp
@@ -55,9 +55,15 @@ void LoginScreen::reset()
     }
 
     if (profiles.isEmpty())
+    {
         ui->stackedWidget->setCurrentIndex(0);
+        ui->newUsername->setFocus();
+    }
     else
+    {
         ui->stackedWidget->setCurrentIndex(1);
+        ui->loginPassword->setFocus();
+    }
 
     ui->autoLoginCB->setChecked(Settings::getInstance().getAutoLogin());
 }