Fix a bit more of SASL auth