TRUNK-4099 Daemon user cannot save a user

(cherry picked from commit 1941264b1baaa207212d846fb6dbc84865a68dfa)