Changed the way users are handled