diff --git a/setup/so-setup b/setup/so-setup
index 45b08433f..e99ab399b 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -430,7 +430,7 @@ host_pillar >> $setup_log 2>&1
 
 if [[ $is_minion || $is_import ]]; then
 	set_updates >> $setup_log 2>&1
-	copy_ssh_key >> $setup_log 2>&1
+	[ "$automated" == no ] && copy_ssh_key >> $setup_log 2>&1
 fi
 
 # Begin install