diff --git a/Makefile b/Makefile
index 3881d6f..05904e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all clean deps fmt vet test docker
 
 EXECUTABLE ?= drone-docker
-IMAGE ?= plugins/$(EXECUTABLE)
+IMAGE ?= plugins/docker
 COMMIT ?= $(shell git rev-parse --short HEAD)
 
 LDFLAGS = -X "main.buildCommit=$(COMMIT)"
diff --git a/plugin.go b/plugin.go
index ac94535..73d6bac 100644
--- a/plugin.go
+++ b/plugin.go
@@ -123,6 +123,18 @@ const dockerExe = "/usr/local/bin/docker"
 
 // helper function to create the docker login command.
 func commandLogin(login Login) *exec.Cmd {
+	if login.Email != "" {
+		return commandLoginEmail(login)
+	}
+	return exec.Command(
+		dockerExe, "login",
+		"-u", login.Username,
+		"-p", login.Password,
+		login.Registry,
+	)
+}
+
+func commandLoginEmail(login Login) *exec.Cmd {
 	return exec.Command(
 		dockerExe, "login",
 		"-u", login.Username,