diff --git a/packstack/installer/run_setup.py b/packstack/installer/run_setup.py
index e8ffbea5a..2486f5db5 100644
--- a/packstack/installer/run_setup.py
+++ b/packstack/installer/run_setup.py
@@ -639,6 +639,10 @@ def _main(options, configFile=None, logFile=None):
         path = _getanswerfilepath()
         if path:
             generateAnswerFile(path)
+    # If an answer file was provided, some options may have been overriden
+    # Overwrite answer file with updated options
+    else:
+        generateAnswerFile(options.answer_file)
 
     # Update masked_value_list with user input values
     _updateMaskedValueSet()
diff --git a/packstack/plugins/heat_650.py b/packstack/plugins/heat_650.py
index 90bcb154e..4f60f943f 100644
--- a/packstack/plugins/heat_650.py
+++ b/packstack/plugins/heat_650.py
@@ -61,7 +61,7 @@ def initConfig(controller):
          "MASK_INPUT": True,
          "LOOSE_VALIDATION": False,
          "CONF_NAME": "CONFIG_HEAT_AUTH_ENC_KEY",
-         "USE_DEFAULT": True,
+         "USE_DEFAULT": False,
          "NEED_CONFIRM": True,
          "CONDITION": False},
 
diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
index 089f52d58..784c4508d 100644
--- a/packstack/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -452,10 +452,11 @@ def dummy_interface(host):
 
 def create_ssh_keys(config, messages):
     migration_key = os.path.join(basedefs.VAR_DIR, 'nova_migration_key')
-    # Generate key
-    local = utils.ScriptRunner()
-    local.append('ssh-keygen -t rsa -b 2048 -f "%s" -N ""' % migration_key)
-    local.execute()
+    # Generate key if it does not exist
+    if not os.path.exists(migration_key):
+        local = utils.ScriptRunner()
+        local.append('ssh-keygen -t rsa -b 2048 -f "%s" -N ""' % migration_key)
+        local.execute()
 
     with open(migration_key) as fp:
         secret = fp.read().strip()