Cleaned up the code a bit and changed DatabaseUserService to UserService as it should be