diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
index 2c469351a..0fb78e8fb 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -71,8 +71,8 @@ def initConfig(controllerObject):
                    "MASK_INPUT"      : True,
                    "LOOSE_VALIDATION": False,
                    "CONF_NAME"       : "CONFIG_KEYSTONE_ADMIN_PW",
-                   "USE_DEFAULT"     : True,
-                   "NEED_CONFIRM"    : False,
+                   "USE_DEFAULT"     : False,
+                   "NEED_CONFIRM"    : True,
                    "CONDITION"       : False },
                   {"CMD_OPTION"      : "keystone-demo-passwd",
                    "USAGE"           : "The password to use for the Keystone demo user",
@@ -83,8 +83,8 @@ def initConfig(controllerObject):
                    "MASK_INPUT"      : True,
                    "LOOSE_VALIDATION": False,
                    "CONF_NAME"       : "CONFIG_KEYSTONE_DEMO_PW",
-                   "USE_DEFAULT"     : True,
-                   "NEED_CONFIRM"    : False,
+                   "USE_DEFAULT"     : False,
+                   "NEED_CONFIRM"    : True,
                    "CONDITION"       : False },
                   {"CMD_OPTION"      : "keystone-token-format",
                    "USAGE"           : "Kestone token format. Use either UUID or PKI",