diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index eaf6c7f..501be1d 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -11,6 +11,9 @@
 # User that should have the authorized keys added
 base_core_management_user: "{{ ansible_user }}"
 
+# If enabled, the password for the management user account will be disabled
+base_core_management_user_disable_password: false
+
 # Install all available updates at runtime
 base_core_install_updates: true
 
diff --git a/roles/base/tasks/core.yml b/roles/base/tasks/core.yml
index 51c7be4..7072883 100644
--- a/roles/base/tasks/core.yml
+++ b/roles/base/tasks/core.yml
@@ -26,6 +26,12 @@
     org_id: "{{ base_redhat_subscription_org_id }}"
     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: