diff --git a/bin/kadeploy3 b/bin/kadeploy3
index 3497d41baf81a12cf8a015f7427713f2a36a4076..f254b345bd543c33533cd3b7bc60506c75823bc8 100755
--- a/bin/kadeploy3
+++ b/bin/kadeploy3
@@ -76,10 +76,10 @@ class KadeployClient < ClientWorkflow
       add_opt(opt,"--no-kexec", "Disable kexec reboots during the deployment process") {
         options[:disable_kexec] = true
       }
-      add_opt(opt,"--never-trust-envirnonment", "Disable kexec to the deployment kernel when environement is trusted") {
+      add_opt(opt,"--never-trust-environment", "Disable kexec to the deployment kernel when environment is trusted") {
         options[:dont_trust_env] = true
       }
-      add_opt(opt,"--disable-bootloader-install", "Disable the automatic installation of a bootloader for a Linux based environnment") {
+      add_opt(opt,"--disable-bootloader-install", "Disable the automatic installation of a bootloader for a Linux based environment") {
         options[:disable_bootloader_install] = true
       }
       add_opt(opt,"--disable-disk-partitioning", "Disable the disk partitioning") {
diff --git a/lib/kadeploy3/server/workflow.rb b/lib/kadeploy3/server/workflow.rb
index df13a6b3392993ebe09f1677cc510cab86c8d0d2..b81bca128246a040450b782cc50c7118b28bfce4 100644
--- a/lib/kadeploy3/server/workflow.rb
+++ b/lib/kadeploy3/server/workflow.rb
@@ -438,7 +438,7 @@ module Workflow
         env_name = node_state['environment']['name']
         env_user = node_state['environment']['user']
         env_version = node_state['environment']['version']
-        node_state['state'] == 'deployed' &&
+        ['deployed','prod_env'].include?(node_state['state']) &&
         context[:cluster].trusted_deployment_user == node_state['user'] &&
         context[:cluster].trusted_deployment_partition == node_state['deploy_part'] &&
         context[:cluster].trusted_envs.any? do |env|