diff --git a/needles/password_required.json b/needles/password_required.json
new file mode 100644
index 00000000..5d884ccb
--- /dev/null
+++ b/needles/password_required.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "password_required",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 0,
+      "ypos": 79,
+      "width": 72,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/password_required.png b/needles/password_required.png
new file mode 100644
index 00000000..32a1cdd1
Binary files /dev/null and b/needles/password_required.png differ
diff --git a/tests/_wait_for_login_screen.pm b/tests/_wait_for_login_screen.pm
index 91ba115b..11591b99 100644
--- a/tests/_wait_for_login_screen.pm
+++ b/tests/_wait_for_login_screen.pm
@@ -20,6 +20,7 @@ sub run {
             {
                 type_string get_var("USER_LOGIN");
                 send_key "ret";
+                assert_screen "password_required", 10;
                 type_string get_var("USER_PASSWORD");
                 send_key "ret";
                 assert_screen "user_logged_in", 10;
@@ -38,6 +39,7 @@ sub run {
                     type_string "root";
                     send_key "ret";
                 }
+                assert_screen "password_required", 10;
                 type_string get_var("ROOT_PASSWORD");
                 send_key "ret";
                 assert_screen "root_logged_in", 10;