Made the logic a bit cleaner for new user creation