Fix admin user form bugs.
Merge pull request #755 from jcushman/admin-tweaks

Fix admin-console user-form bugs.