Rename UserName to Username, reorder GetAuthType checks