diff --git a/commands.go b/commands.go
index e078a97fd1..236fb65d10 100644
--- a/commands.go
+++ b/commands.go
@@ -333,13 +333,6 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 		authconfig = auth.AuthConfig{}
 	}
 
-	sigchan := make(chan os.Signal, 1)
-	signal.Notify(sigchan, syscall.SIGINT, syscall.SIGTERM)
-	go func() {
-		<-sigchan
-		os.Exit(1)
-	}()
-
 	if *flUsername == "" {
 		promptDefault("Username", authconfig.Username)
 		username = readAndEchoString(cli.in, cli.out)
diff --git a/term/termios_darwin.go b/term/termios_darwin.go
index 24e79de4b2..0f6b24b184 100644
--- a/term/termios_darwin.go
+++ b/term/termios_darwin.go
@@ -44,7 +44,7 @@ func MakeRaw(fd uintptr) (*State, error) {
 	newState.Iflag &^= (ISTRIP | INLCR | IGNCR | IXON | IXOFF)
 	newState.Iflag |= ICRNL
 	newState.Oflag |= ONLCR
-	newState.Lflag &^= (ECHO | ICANON | ISIG)
+	newState.Lflag &^= (ECHO | ICANON)
 
 	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
 		return nil, err
diff --git a/term/termios_linux.go b/term/termios_linux.go
index 4a717c84a7..22f4fff430 100644
--- a/term/termios_linux.go
+++ b/term/termios_linux.go
@@ -33,7 +33,7 @@ func MakeRaw(fd uintptr) (*State, error) {
 
 	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON)
 	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)
+	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.IEXTEN)
 	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)
 	newState.Cflag |= syscall.CS8