diff --git a/needles/anaconda/help/help_create_user-20220204.json b/needles/anaconda/help/help_user_creation-20220204.json
similarity index 76%
rename from needles/anaconda/help/help_create_user-20220204.json
rename to needles/anaconda/help/help_user_creation-20220204.json
index 38f3da7d..dfa9a678 100644
--- a/needles/anaconda/help/help_create_user-20220204.json
+++ b/needles/anaconda/help/help_user_creation-20220204.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_help_create_user"
+    "anaconda_help_user_creation"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/help/help_create_user-20220204.png b/needles/anaconda/help/help_user_creation-20220204.png
similarity index 100%
rename from needles/anaconda/help/help_create_user-20220204.png
rename to needles/anaconda/help/help_user_creation-20220204.png
diff --git a/needles/anaconda/help/help_create_user.json b/needles/anaconda/help/help_user_creation.json
similarity index 82%
rename from needles/anaconda/help/help_create_user.json
rename to needles/anaconda/help/help_user_creation.json
index 755d0b16..040e81cf 100644
--- a/needles/anaconda/help/help_create_user.json
+++ b/needles/anaconda/help/help_user_creation.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_help_create_user"
+    "anaconda_help_user_creation"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/help/help_create_user.png b/needles/anaconda/help/help_user_creation.png
similarity index 100%
rename from needles/anaconda/help/help_create_user.png
rename to needles/anaconda/help/help_user_creation.png
diff --git a/needles/anaconda/install_process/user_creation-20200219.json b/needles/anaconda/install_process/user_creation-20200219.json
index 53670ebb..80715a24 100644
--- a/needles/anaconda/install_process/user_creation-20200219.json
+++ b/needles/anaconda/install_process/user_creation-20200219.json
@@ -11,6 +11,7 @@
   "properties": [],
   "tags": [
     "ENV-DISTRI-fedora",
-    "anaconda_install_user_creation"
+    "anaconda_install_user_creation",
+    "anaconda_main_hub_user_creation",
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/install_process/user_creation-kde-20210805.json b/needles/anaconda/install_process/user_creation-kde-20210805.json
index 5514cf8f..be1e9548 100644
--- a/needles/anaconda/install_process/user_creation-kde-20210805.json
+++ b/needles/anaconda/install_process/user_creation-kde-20210805.json
@@ -11,6 +11,7 @@
   "properties": [],
   "tags": [
     "ENV-DISTRI-fedora",
-    "anaconda_install_user_creation"
+    "anaconda_install_user_creation",
+    "anaconda_main_hub_user_creation"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/main_hub/create_user-kde-20210805.json b/needles/anaconda/main_hub/create_user-kde-20210805.json
deleted file mode 100644
index 5b7107ce..00000000
--- a/needles/anaconda/main_hub/create_user-kde-20210805.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 29,
-      "width": 29,
-      "xpos": 726,
-      "ypos": 397
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_main_hub_create_user"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/create_user-kde-20210805.png b/needles/anaconda/main_hub/create_user-kde-20210805.png
deleted file mode 100644
index b05ceffc..00000000
Binary files a/needles/anaconda/main_hub/create_user-kde-20210805.png and /dev/null differ
diff --git a/needles/anaconda/main_hub/create_user.json b/needles/anaconda/main_hub/create_user.json
deleted file mode 100644
index 9f951d99..00000000
--- a/needles/anaconda/main_hub/create_user.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "anaconda_main_hub_create_user"
-  ],
-  "area": [
-    {
-      "xpos": 248,
-      "ypos": 556,
-      "width": 32,
-      "height": 33,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/create_user.png b/needles/anaconda/main_hub/create_user.png
deleted file mode 100644
index 1bc27633..00000000
Binary files a/needles/anaconda/main_hub/create_user.png and /dev/null differ
diff --git a/tests/anaconda_help.pm b/tests/anaconda_help.pm
index ccd683ff..da455c0c 100644
--- a/tests/anaconda_help.pm
+++ b/tests/anaconda_help.pm
@@ -26,7 +26,7 @@ sub run {
     my @testplan;
     # For LIVE KDE:
     if ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) {
-        @testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/;
+        @testplan = qw/keyboard_layout time_date install_destination network_host_name root_password user_creation/;
     }
     # For LIVE Workstation
     elsif ((get_var('LIVE')) && (get_var('DESKTOP') eq "gnome")) {
@@ -38,7 +38,7 @@ sub run {
     }
     # For ServerDVD
     else {
-        @testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password create_user/;
+        @testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password user_creation/;
     }
 
     # Iterate over test plan and do the tests.