diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
@@ -28,7 +28,6 @@
 import "../components"
 
 SessionManagementScreen {
-    id: root
     /*
      * Login has been requested with the following username and password
      * If username field is visible, it will be taken from that, otherwise from the "name" property of the currentIndex
@@ -67,6 +66,7 @@
         placeholderText: i18nd("plasma_lookandfeel_org", "Password")
         focus: true
         echoMode: TextInput.Password
+        enabled: !authenticator.graceLocked
 
         onAccepted: startLogin()
 
@@ -84,6 +84,14 @@
                 event.accepted = true
             }
         }
+
+        Connections {
+            target: root
+            onClearPassword: {
+                passwordBox.forceActiveFocus()
+                passwordBox.selectAll()
+            }
+        }
     }
 
     PlasmaComponents.Button {