diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
index 8829666f1..6d3d62804 100644
--- a/sddm-theme/Login.qml
+++ b/sddm-theme/Login.qml
@@ -83,7 +83,7 @@ SessionManagementScreen {
                 }
             }
 
-            visible: userList.currentItem.needsPassword
+            visible: root.showUsernamePrompt || userList.currentItem.needsPassword
 
             Keys.onEscapePressed: {
                 mainStack.currentItem.forceActiveFocus();
@@ -119,7 +119,7 @@ SessionManagementScreen {
 
             icon.name: text.length == 0 ? "go-next" : ""
 
-            text: userList.currentItem.needsPassword ? "" : i18n("Log In")
+            text: root.showUsernamePrompt || userList.currentItem.needsPassword ? "" : i18n("Log In")
             onClicked: startLogin();
         }
     }