Fix UserService
Merge branch 'master' of https://github.com/simonkaltenbacher/calendar