Tweaks to how user auth works