Fixed last bug with new user features