diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 504dc38..f08691b 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -14,6 +14,7 @@
   - import_tasks: software/packages_utilities.yml
 
   # Perform remaining tasks:
+  - import_tasks: users.yml
   - import_tasks: system_setup/clock.yml
   - import_tasks: system_setup/cron.yml
   - import_tasks: system_setup/locale.yml
@@ -23,7 +24,6 @@
   - import_tasks: system_setup/openssh.yml
   - import_tasks: system_setup/scripts.yml
 
-  - import_tasks: users.yml
 
   # Set up the ansible environment
   # - import_tasks: ansible_setup.yml