diff --git a/installer/inventory b/installer/inventory
index d4596f5d96..289bfdcb53 100644
--- a/installer/inventory
+++ b/installer/inventory
@@ -104,7 +104,7 @@ pg_port=5432
 # This will create or update a default admin (superuser) account in AWX, if not provided
 # then these default values are used
 admin_user=admin
-admin_password=password
+# admin_password=password
 
 # Whether or not to create preload data for demonstration purposes
 create_preload_data=True
diff --git a/installer/roles/check_vars/tasks/main.yml b/installer/roles/check_vars/tasks/main.yml
index 3699d4e4f6..61ffa1cb77 100644
--- a/installer/roles/check_vars/tasks/main.yml
+++ b/installer/roles/check_vars/tasks/main.yml
@@ -1,5 +1,11 @@
 # main.yml
 ---
+- name: admin_password should be defined
+  assert:
+    that:
+      - admin_password is defined and admin_password != ''
+    msg: "Set the value of 'admin_password' in the inventory file."
+
 - include_tasks: check_openshift.yml
   when: openshift_host is defined and openshift_host != ''