Minor Authentication Tweaks