diff --git a/plugins/registry/subcommands.go b/plugins/registry/subcommands.go
index 53d97447d..a5d2c5359 100644
--- a/plugins/registry/subcommands.go
+++ b/plugins/registry/subcommands.go
@@ -31,6 +31,10 @@ func CommandLogin(server string, username string, password string, passwordStdin
 		return errors.New("Missing password argument")
 	}
 
+	if server == "hub.docker.com" || server == "docker.com" {
+		server = "docker.io"
+	}
+
 	command := []string{
 		common.DockerBin(),
 		"login",