diff --git a/Login.qml b/Login.qml

index 50b431a..20bc84d 100644

--- a/Login.qml

+++ b/Login.qml

@@ -29,6 +29,13 @@ SessionManagementScreen {

         }

     }

+    onVisibleChanged: {

+        if (visible == true){

+            connection.pwdItem = passwordBox

+            connection.getsBackFocus = passwordBox

+        }

+    }

+

     /*

     * 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

@@ -100,13 +107,6 @@ SessionManagementScreen {

                 }

             }

-            Connections {

-                target: sddm

-                function onLoginFailed() {

-                    passwordBox.selectAll()

-                    passwordBox.forceActiveFocus()

-                }

-            }

         }

         PlasmaComponents3.Button {

--- a/Main.qml

+++ b/Main.qml

@@ -15,6 +15,7 @@ import org.kde.plasma.extras 2.0 as Plas

 import "components"

 import "components/animation"

+import SddmComponents 2.0 as SddmComponents

 // TODO: Once SDDM 0.19 is released and we are setting the font size using the

 // SDDM KCM's syncing feature, remove the `config.fontSize` overrides here and

@@ -145,6 +146,29 @@ PlasmaCore.ColorScope {

             Layout.alignment: Qt.AlignBaseline

         }

+    SddmComponents.PasswordRenewal {

+        id: renewal

+        anchors.horizontalCenter: clock.horizontalCenter

+        anchors.top: clock.bottom

+        anchors.topMargin: footer.height

+        visible: false

+        radius: 8

+        color: "#00888888"

+        //infosColor: "lightcoral"

+

+        onVisibleChanged: mainStack.visible = !visible

+    }

+

+    // container for password renewal logic

+    SddmComponents.PasswordConnections {

+        id: connection

+        renewalDialog: renewal

+        pwdItem: null // use PasswordBox.text

+        getsBackFocus: null

+        //errMsg: none

+        //txtMsg: none

+    }

+

         QQC2.StackView {

             id: mainStack

             anchors {