diff --git a/Modules/LockScreen/LockContext.qml b/Modules/LockScreen/LockContext.qml
index 7c34059..b766191 100644
--- a/Modules/LockScreen/LockContext.qml
+++ b/Modules/LockScreen/LockContext.qml
@@ -12,6 +12,7 @@ Scope {
   property bool unlockInProgress: false
   property bool showFailure: false
   property string errorMessage: ""
+  property string infoMessage: ""
   property bool pamAvailable: typeof PamContext !== "undefined"
 
   onCurrentTextChanged: {
@@ -28,12 +29,6 @@ Scope {
       return
     }
 
-    if (currentText === "") {
-      errorMessage = "Password required"
-      showFailure = true
-      return
-    }
-
     root.unlockInProgress = true
     errorMessage = ""
     showFailure = false
@@ -52,6 +47,8 @@ Scope {
 
       if (messageIsError) {
         errorMessage = message
+      } else {
+        infoMessage = message
       }
 
       if (responseRequired) {
diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml
index 90eaba9..190b9a1 100644
--- a/Modules/LockScreen/LockScreen.qml
+++ b/Modules/LockScreen/LockScreen.qml
@@ -511,6 +511,7 @@ Loader {
                       width: 0
                       height: 0
                       visible: false
+                      enabled: !lockContext.unlockInProgress
                       font.family: Settings.data.ui.fontFixed
                       font.pointSize: Style.fontSizeL * scaling
                       color: Color.mOnSurface
@@ -540,7 +541,7 @@ Loader {
                       color: Color.mOnSurface
                       font.family: Settings.data.ui.fontFixed
                       font.pointSize: Style.fontSizeL * scaling
-                      visible: passwordInput.activeFocus
+                      visible: passwordInput.activeFocus && !lockContext.unlockInProgress
 
                       SequentialAnimation {
                         id: typingEffect
@@ -584,7 +585,7 @@ Loader {
                   NText {
                     text: {
                       if (lockContext.unlockInProgress)
-                        return "Authenticating..."
+                        return lockContext.infoMessage || "Authenticating..."
                       if (lockContext.showFailure && lockContext.errorMessage)
                         return lockContext.errorMessage
                       if (lockContext.showFailure)