diff --git a/api/client/login.go b/api/client/login.go
index 68ec5c6d9c..7e3d73ca05 100644
--- a/api/client/login.go
+++ b/api/client/login.go
@@ -64,7 +64,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 	if username == "" {
 		promptDefault("Username", authconfig.Username)
 		username = readInput(cli.in, cli.out)
-		username = strings.Trim(username, " ")
+		username = strings.TrimSpace(username)
 		if username == "" {
 			username = authconfig.Username
 		}