diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
index 9ccd992f1..2a77d0cb7 100644
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -38,6 +38,7 @@ PlasmaCore.ColorScope {
             graceLockTimer.restart();
             notificationRemoveTimer.restart();
             rejectPasswordAnimation.start();
+            lockScreenUi.hadPrompt = false;
         }
 
         function onSucceeded() {
@@ -65,17 +66,21 @@ PlasmaCore.ColorScope {
         }
 
         function onPrompt(msg) {
-            lockScreenUi.hadPrompt = true;
             root.notification = msg;
             mainBlock.echoMode = TextInput.Normal
-            mainBlock.mainPasswordBox.text = "";
+            if (lockScreenUi.hadPrompt) {
+                mainBlock.mainPasswordBox.text = "";
+            }
             mainBlock.mainPasswordBox.forceActiveFocus();
+            lockScreenUi.hadPrompt = true;
         }
         function onPromptForSecret(msg) {
-            lockScreenUi.hadPrompt = true;
             mainBlock.echoMode = TextInput.Password
-            mainBlock.mainPasswordBox.text = "";
+            if (lockScreenUi.hadPrompt) {
+                mainBlock.mainPasswordBox.text = "";
+            }
             mainBlock.mainPasswordBox.forceActiveFocus();
+            lockScreenUi.hadPrompt = true;
         }
     }