Fixed for new user login - thought this was working :(