diff --git a/lib/utils.pm b/lib/utils.pm
index 23ce9f64..bbb1e335 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -852,7 +852,11 @@ sub anaconda_create_user {
         wait_still_screen 2;
         _type_user_password();
     }
-    assert_and_click "anaconda_install_user_creation_make_admin";
+    # FIXME: this is selected by default from F36 (20210118.n.0) on.
+    # we can drop this block and associated needles entirely on F35 EOL
+    unless (check_screen "anaconda_install_user_creation_admin_selected") {
+        assert_and_click "anaconda_install_user_creation_make_admin";
+    }
     assert_and_click "anaconda_spoke_done";
     # since 20170105, we will get a warning here when the password
     # contains non-ASCII characters. Assume only switched layouts
diff --git a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json
new file mode 100644
index 00000000..4c70644c
--- /dev/null
+++ b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 21,
+      "ypos": 188,
+      "xpos": 500,
+      "width": 185
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-arabic",
+    "anaconda_install_user_creation_admin_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png
new file mode 100644
index 00000000..534d0a4f
Binary files /dev/null and b/needles/anaconda/install_process/arabic/user_creation_admin_selected_arabic-untranslated-20220118.png differ
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json
new file mode 100644
index 00000000..fdcc2386
--- /dev/null
+++ b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 194,
+      "height": 21,
+      "ypos": 187,
+      "xpos": 344,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-english",
+    "anaconda_install_user_creation_admin_selected"
+  ]
+}
diff --git a/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png
new file mode 100644
index 00000000..211124fa
Binary files /dev/null and b/needles/anaconda/install_process/french/user_creation_admin_selected_french-untranslated-20220118.png differ
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json
new file mode 100644
index 00000000..fdcc2386
--- /dev/null
+++ b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 194,
+      "height": 21,
+      "ypos": 187,
+      "xpos": 344,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-english",
+    "anaconda_install_user_creation_admin_selected"
+  ]
+}
diff --git a/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png
new file mode 100644
index 00000000..211124fa
Binary files /dev/null and b/needles/anaconda/install_process/japanese/user_creation_admin_selected_japanese-untranslated-20220118.png differ
diff --git a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json
new file mode 100644
index 00000000..59edeae9
--- /dev/null
+++ b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 283,
+      "type": "match",
+      "ypos": 187,
+      "xpos": 248,
+      "height": 21
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-russian",
+    "anaconda_install_user_creation_admin_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png
new file mode 100644
index 00000000..539e30ad
Binary files /dev/null and b/needles/anaconda/install_process/russian/user_creation_admin_selected_russian-20220118.png differ
diff --git a/needles/anaconda/install_process/user_creation_admin_selected-20220118.json b/needles/anaconda/install_process/user_creation_admin_selected-20220118.json
new file mode 100644
index 00000000..fdcc2386
--- /dev/null
+++ b/needles/anaconda/install_process/user_creation_admin_selected-20220118.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 194,
+      "height": 21,
+      "ypos": 187,
+      "xpos": 344,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "LANGUAGE-english",
+    "anaconda_install_user_creation_admin_selected"
+  ]
+}
diff --git a/needles/anaconda/install_process/user_creation_admin_selected-20220118.png b/needles/anaconda/install_process/user_creation_admin_selected-20220118.png
new file mode 100644
index 00000000..211124fa
Binary files /dev/null and b/needles/anaconda/install_process/user_creation_admin_selected-20220118.png differ