Move the nick check to the non-SASL-only area