diff --git a/bin/kareboot3 b/bin/kareboot3
index e7bf7a7e8742d17e3199dc3a2cde274ded243fa9..1893432039d9c8d426c19bbc7f9e984e1f43aa60 100755
--- a/bin/kareboot3
+++ b/bin/kareboot3
@@ -89,7 +89,7 @@ class KarebootClient < ClientWorkflow
         return false
       end
       unless options[:deploy_part]
-        error("A partition number must be specified must be with the recorded_env kind of reboot")
+        error("A partition label must be specified must be with the recorded_env kind of reboot")
         return false
       end
     end
@@ -171,7 +171,7 @@ class KarebootClient < ClientWorkflow
 
     # Check if the environment contains local files
 
-    options[:key] = options[:default_config_options][:key] if options[:key].nil? && options[:default_config_options][:key]
+    options[:key] = options[:default_config_options][:key] if options[:key].nil? && options[:default_config_options][:key] && options[:operation] == :deploy_env
     options.delete(:key) if options[:key] == 'none'
     if options[:key]
       params[:ssh_authorized_keys] = load_keyfile(options[:key])