diff --git a/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.json b/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.json
new file mode 100644
index 00000000..808a788b
--- /dev/null
+++ b/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "anaconda_select_install_lang_english_filtered",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-OFW-1",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 221,
+      "ypos": 205,
+      "width": 126,
+      "height": 26,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.png b/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.png
new file mode 100644
index 00000000..21f18050
Binary files /dev/null and b/needles/anaconda_select_install_lang_english_filtered_english_selected_as_default.png differ
diff --git a/templates b/templates
index b9d7af7d..3a54a130 100755
--- a/templates
+++ b/templates
@@ -55,7 +55,7 @@
                         { key => "NUMDISKS", value => "2" },
                         { key => "HDD_2". value => "disk_full.img" },
                         { key => "DO_LOGIN". value => "1" },
-                        { key => "ROOT_PASSWORD". value => "fedora" },
+                        { key => "ROOT_PASSWORD". value => "weakpassword" },
                       ],
                       variables => "",
                     },
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 0b3698b4..ec3b4793 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -11,12 +11,12 @@ sub run {
 
     # Set root password
     assert_and_click "anaconda_install_root_password";
-    type_string "fedora";
+    type_string "weakpassword";
     send_key "tab";
-    type_string "fedora";
+    type_string "weakpassword";
     assert_and_click "anaconda_spoke_done";
     # weak password - click "done" once again"
-    assert_and_click "anaconda_spoke_done";
+    #assert_and_click "anaconda_spoke_done";
 
     # Set user details
     assert_and_click "anaconda_install_user_creation";
@@ -25,13 +25,13 @@ sub run {
     send_key "tab";
     send_key "tab";
     send_key "tab";
-    type_string "fedora";
+    type_string "weakpassword";
     send_key "tab";
-    type_string "fedora";
+    type_string "weakpassword";
     assert_and_click "anaconda_install_user_creation_make_admin";
     assert_and_click "anaconda_spoke_done";
     # weak password - click "done" once again"
-    assert_and_click "anaconda_spoke_done";
+    #assert_and_click "anaconda_spoke_done";
 
     # Wait for install to end
     assert_screen "anaconda_install_done", 1800;