added handling for new users