Update to avoid errors when user already exists
Merge
Use Moritz code for UserService