diff --git a/imap.js b/imap.js
index 1248df8..03dbc9c 100644
--- a/imap.js
+++ b/imap.js
@@ -960,9 +960,8 @@ ImapConnection.prototype._login = function(cb) {
 
     if (this.capabilities.indexOf('AUTH=XOAUTH') !== -1 && 'xoauth' in this._options)
       this._send('AUTHENTICATE XOAUTH ' + escape(this._options.xoauth), fnReturn);
-    else if (this.capabilities.indexOf('AUTH=PLAIN') !== -1 ||
-             // Kludge due to GMail no longer advertising plaintext auth ...
-             this.capabilities.indexOf('X-GM-EXT-1') !== -1) {
+    else if (this._options.username !== undefined &&
+             this._options.password !== undefined) {
       this._send('LOGIN "' + escape(this._options.username) + '" "'
                  + escape(this._options.password) + '"', fnReturn);
     } else {