Fix new user bug