Fix admin creation / editing of users

Closes #1741