Fix logging service
Merge branch 'user' into sso