--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -70,7 +70,7 @@ void SaslAuthOp::gotProperties(Tp::Pendi
     QString error = qdbus_cast<QString>(m_properties.value(QLatin1String("SASLError")));
     QVariantMap errorDetails = qdbus_cast<QVariantMap>(m_properties.value(QLatin1String("SASLErrorDetails")));
 
-    if (m_mechanisms.contains(QLatin1String("X-OAUTH2"))) {
+    if (m_mechanisms.contains(QLatin1String("X-OAUTH2")) && m_mechanisms.contains(QLatin1String("X-GOOGLE-TOKEN"))) {
         qDebug() << "Starting X-OAuth2 auth";
         m_mechanisms.removeAll(QStringLiteral("X-OAUTH2"));
         XTelepathySSOGoogleOperation *authop = new XTelepathySSOGoogleOperation(m_account, m_accountStorageId, m_saslIface);