Fixed the new user bug