--- a/lookandfeel/org.kde.breeze/contents/components/SessionManagementScreen.qml
+++ b/lookandfeel/org.kde.breeze/contents/components/SessionManagementScreen.qml
@@ -76,6 +76,9 @@ FocusScope {
         fontSize: root.fontSize
         // bubble up the signal
         onUserSelected: root.userSelected()
+        onCurrentItemChanged: {
+            userNameInput.text = currentItem.userName
+        }
     }
 
     //goal is to show the prompts, in ~16 grid units high, then the action buttons
@@ -125,5 +128,6 @@ FocusScope {
         Item {
             Layout.fillHeight: true
         }
+
     }
 }
--- a/lookandfeel/sddm-theme/Main.qml
+++ b/lookandfeel/sddm-theme/Main.qml
@@ -172,7 +172,7 @@ PlasmaCore.ColorScope {
                 id: userListComponent
                 userListModel: userModel
                 loginScreenUiVisible: loginScreenRoot.uiVisible
-                userListCurrentIndex: userModel.lastIndex >= 0 ? userModel.lastIndex : 0
+                userListCurrentIndex: userModel.lastIndex
                 lastUserName: userModel.lastUser
                 showUserList: {
                     if ( !userListModel.hasOwnProperty("count")
--- a/lookandfeel/sddm-theme/Login.qml
+++ b/lookandfeel/sddm-theme/Login.qml
@@ -55,7 +55,7 @@ SessionManagementScreen {
      * If username field is visible, it will be taken from that, otherwise from the "name" property of the currentIndex
      */
     function startLogin() {
-        const username = showUsernamePrompt ? userNameInput.text : userList.selectedUser
+        const username = (userNameInput.text == "") ? userList.selectedUser : userNameInput.text
         const password = passwordBox.text
 
         footer.enabled = false
@@ -77,8 +77,7 @@ SessionManagementScreen {
         Layout.fillWidth: true
 
         text: lastUserName
-        visible: showUsernamePrompt
-        focus: showUsernamePrompt && !lastUserName //if there's a username prompt it gets focus first, otherwise password does
+        focus: !lastUserName //if there's a username prompt it gets focus first, otherwise password does
         placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Username")
 
         onAccepted: {
@@ -97,7 +96,7 @@ SessionManagementScreen {
             Layout.fillWidth: true
 
             placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password")
-            focus: !showUsernamePrompt || lastUserName
+            focus: lastUserName
 
             // Disable reveal password action because SDDM does not have the breeze icon set loaded
             rightActions: []