diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go
index 1cde6f8255..1a40213eac 100644
--- a/cli/command/registry/login.go
+++ b/cli/command/registry/login.go
@@ -109,7 +109,9 @@ func runLogin(ctx context.Context, dockerCli command.Cli, opts loginOptions) err
 		serverAddress string
 		response      *registrytypes.AuthenticateOKBody
 	)
-	if opts.serverAddress != "" && opts.serverAddress != registry.DefaultNamespace {
+	if opts.serverAddress != "" &&
+		opts.serverAddress != registry.DefaultNamespace &&
+		opts.serverAddress != registry.DefaultRegistryHost {
 		serverAddress = opts.serverAddress
 	} else {
 		serverAddress = registry.IndexServer