Single user auth, refactor