diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bb9fed91..c358e0244 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * [alerts] Add support for the duration_before_trigger attribute [#407](https://github.com/Scalingo/cli/pull/407)
 * [domains] Handle Let's Encrypt certificate status [#410](https://github.com/Scalingo/cli/pull/410)
+* Fix login with SSH [#419](https://github.com/Scalingo/cli/pull/419)
 
 ### 1.10.1
 
diff --git a/session/login.go b/session/login.go
index f0b4fdaec..5ebd05e7d 100644
--- a/session/login.go
+++ b/session/login.go
@@ -46,6 +46,8 @@ func Login(opts LoginOpts) error {
 				}
 				return errors.Wrap(err, "fail to login with SSH")
 			}
+		} else {
+			return nil
 		}
 	}