First shot to fix SASL auth