Merged #254 "Two slight improvement for custom UserService"