diff --git a/lib/Connection.js b/lib/Connection.js
index 11ea916..f60772e 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -1463,8 +1463,10 @@ Connection.prototype._login = function() {
       if (self.serverSupports('STARTTLS')
           && (self._config.autotls === 'always'
               || (self._config.autotls === 'required'
-                  && self.serverSupports('LOGINDISABLED'))))
+                  && self.serverSupports('LOGINDISABLED')))) {
           self._starttls();
+          return;
+      }
 
       if (self.serverSupports('LOGINDISABLED')) {
         err = new Error('Logging in is disabled on this server');