Fixed id names in services.
Updated UserService.
Merged pull request from teugis/master