diff --git a/needles/anaconda_install_root_password_screen.json b/needles/anaconda_install_root_password_screen.json
new file mode 100644
index 00000000..f57ec91f
--- /dev/null
+++ b/needles/anaconda_install_root_password_screen.json
@@ -0,0 +1,32 @@
+{
+  "area": [
+    {
+      "xpos": 8,
+      "ypos": 8,
+      "width": 140,
+      "height": 18,
+      "type": "match"
+    },
+    {
+      "xpos": 8,
+      "ypos": 46,
+      "width": 63,
+      "height": 32,
+      "type": "match"
+    },
+    {
+      "xpos": 242,
+      "ypos": 130,
+      "width": 96,
+      "height": 16,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "anaconda_install_root_password_screen",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_root_password_screen.png b/needles/anaconda_install_root_password_screen.png
new file mode 100644
index 00000000..74d3eb6e
Binary files /dev/null and b/needles/anaconda_install_root_password_screen.png differ
diff --git a/needles/anaconda_install_user_creation_screen.json b/needles/anaconda_install_user_creation_screen.json
new file mode 100644
index 00000000..31c94cc3
--- /dev/null
+++ b/needles/anaconda_install_user_creation_screen.json
@@ -0,0 +1,25 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_install_user_creation_screen",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 4,
+      "ypos": 7,
+      "width": 107,
+      "height": 20,
+      "type": "match"
+    },
+    {
+      "xpos": 6,
+      "ypos": 47,
+      "width": 66,
+      "height": 33,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_screen.png b/needles/anaconda_install_user_creation_screen.png
new file mode 100644
index 00000000..96f21ada
Binary files /dev/null and b/needles/anaconda_install_user_creation_screen.png differ
diff --git a/needles/anaconda_user_creation_password_input.json b/needles/anaconda_user_creation_password_input.json
new file mode 100644
index 00000000..b8cf4789
--- /dev/null
+++ b/needles/anaconda_user_creation_password_input.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "anaconda_user_creation_password_input",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 270,
+      "ypos": 285,
+      "width": 243,
+      "height": 25,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_user_creation_password_input.png b/needles/anaconda_user_creation_password_input.png
new file mode 100644
index 00000000..83a50e6d
Binary files /dev/null and b/needles/anaconda_user_creation_password_input.png differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index a66ea164..08f231ab 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -12,6 +12,7 @@ sub run {
     # Set root password
     my $root_password = get_var("ROOT_PASSWORD") || "weakpassword";
     assert_and_click "anaconda_install_root_password";
+    assert_screen "anaconda_install_root_password_screen";
     type_string $root_password;
     send_key "tab";
     type_string $root_password;
@@ -24,11 +25,9 @@ sub run {
     my $user_login = get_var("USER_LOGIN") || "test";
     my $user_password = get_var("USER_PASSWORD") || "weakpassword";
     assert_and_click "anaconda_install_user_creation";
+    assert_screen "anaconda_install_user_creation_screen";
     type_string $user_login;
-    send_key "tab";
-    send_key "tab";
-    send_key "tab";
-    send_key "tab";
+    assert_and_click "anaconda_user_creation_password_input";
     type_string $user_password;
     send_key "tab";
     type_string $user_password;