[DEV-1740] Fix 500 error on modifying users from admin.

The upstream changes fixing this issue were merged.  My only change was to substitute AuthUser for User, where needed.