Updated and fixed problems with the new user-class