diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go
index 08a9c7b66..fec33891f 100644
--- a/builder/amazon/common/step_get_password.go
+++ b/builder/amazon/common/step_get_password.go
@@ -26,11 +26,10 @@ type StepGetPassword struct {
 
 func (s *StepGetPassword) Run(state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
-	image := state.Get("source_image").(*ec2.Image)
 
-	// Skip if we're not Windows...
-	if image.Platform == nil || *image.Platform != "windows" {
-		log.Printf("[INFO] Not Windows, skipping get password...")
+	// Skip if we're not using winrm
+	if s.Comm.Type != "winrm" {
+		log.Printf("[INFO] Not using winrm communicator, skipping get password...")
 		return multistep.ActionContinue
 	}