In progress tweaks for user auth