Make messages consistant when using auth/deauth