diff --git a/src/identity.cpp b/src/identity.cpp
--- a/src/identity.cpp
+++ b/src/identity.cpp
@@ -55,7 +55,7 @@
 
 void Identity::init()
 {
-    setAuthType(QStringLiteral("nickserv"));
+    setAuthType(QStringLiteral("saslplain"));
     setNickservNickname(QStringLiteral("nickserv"));
     setNickservCommand(QStringLiteral("identify"));
 
diff --git a/src/identitydialog.cpp b/src/identitydialog.cpp
--- a/src/identitydialog.cpp
+++ b/src/identitydialog.cpp
@@ -88,10 +88,10 @@
         m_additionalAuthInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         connect(m_authTypeCombo, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &IdentityDialog::authTypeChanged);
-        m_authTypeCombo->addItem(i18n("Standard NickServ"), QStringLiteral("nickserv"));
-        m_authTypeCombo->addItem(i18n("Server Password"), QStringLiteral("serverpw"));
         m_authTypeCombo->addItem(i18n("SASL PLAIN"), QStringLiteral("saslplain"));
         m_authTypeCombo->addItem(i18nc("Cert = Certificate", "SASL EXTERNAL (Cert)"), QStringLiteral("saslexternal"));
+        m_authTypeCombo->addItem(i18n("Standard NickServ"), QStringLiteral("nickserv"));
+        m_authTypeCombo->addItem(i18n("Server Password"), QStringLiteral("serverpw"));
         m_authTypeCombo->addItem(i18n("SSL Client Certificate"), QStringLiteral("pemclientcert"));
 
         // add encodings to combo box
@@ -367,23 +367,23 @@
     {
         QString authType = m_authTypeCombo->itemData(index).toString();
 
-        bool isNickServ = (authType == QLatin1String("nickserv"));
         bool isSaslPlain = (authType == QLatin1String("saslplain"));
         bool isSaslExernal = (authType == QLatin1String("saslexternal"));
+        bool isNickServ = (authType == QLatin1String("nickserv"));
         bool isServerPw = (authType == QLatin1String("serverpw"));
         bool isPemClientCert = (isSaslExernal || (authType == QLatin1String("pemclientcert")));
 
+        saslAccountLabel->setVisible(isSaslPlain || isSaslExernal);
+        m_saslAccountEdit->setVisible(isSaslPlain || isSaslExernal);
         nickservNicknameLabel->setVisible(isNickServ);
         m_nickservNicknameEdit->setVisible(isNickServ);
         nickservCommandLabel->setVisible(isNickServ);
         m_nickservCommandEdit->setVisible(isNickServ);
-        saslAccountLabel->setVisible(isSaslPlain || isSaslExernal);
-        m_saslAccountEdit->setVisible(isSaslPlain || isSaslExernal);
         authPasswordLabel->setVisible(!isPemClientCert);
         m_authPasswordEdit->setVisible(!isPemClientCert);
         pemClientCertFileLabel->setVisible(isPemClientCert);
         m_pemClientCertFile->setVisible(isPemClientCert);
-        m_additionalAuthInfo->setVisible(isServerPw || isPemClientCert);
+        m_additionalAuthInfo->setVisible(isNickServ || isServerPw || isPemClientCert);
 
         // Clear.
         m_saslAccountEdit->setPlaceholderText(QString());
@@ -398,6 +398,8 @@
             autoIdentifyLayout->addRow(nickservNicknameLabel, m_nickservNicknameEdit);
             autoIdentifyLayout->addRow(nickservCommandLabel, m_nickservCommandEdit);
             autoIdentifyLayout->addRow(authPasswordLabel, m_authPasswordEdit);
+            m_additionalAuthInfo->setText(i18n("NickServ may not function with auto-join, SASL is recommended instead."));
+            autoIdentifyLayout->addRow(nullptr, m_additionalAuthInfo);
         }
         else if (isServerPw)
         {