UserManager and UserService cleaned up. fixed #3