Fixed bugs on new user