diff --git a/roles/base/tasks/core.yml b/roles/base/tasks/core.yml
index 7072883..1f64694 100644
--- a/roles/base/tasks/core.yml
+++ b/roles/base/tasks/core.yml
@@ -27,12 +27,6 @@
     pool: '^(Red Hat Enterprise Server|Red Hat Virtualization)$'
   when: ansible_distribution == 'RedHat' and base_redhat_subscription_org_id != "" and base_redhat_subscription_activationkey != ""
 
-- name: Disable passsword for management account
-  user:
-    name: "{{ base_core_management_user }}"
-    password_lock: yes
-  when: base_core_management_user_disable_password == true
-  
 - name: "*** MOTD Configuration ***"
   include_tasks: 
     file: core_motd.yml
@@ -82,3 +76,9 @@
   when: base_core_web_management == true
   tags:
   - web_management
+
+- name: Disable passsword for management account
+  user:
+    name: "{{ base_core_management_user }}"
+    password_lock: yes
+  when: base_core_management_user_disable_password == true