Fix post-rebase leftovers for SCRAM
Fix invalid match order in auth_internal