(bug 4062) Remove debugging code.
(bug 4062) Escape things
(bug 4062) include userid in response
Merge branch 'feature/bug4062' into feature/bug4062-auth