[DEV-1740] Cherry-pick upstream change fixing 500 on user update from admin.