Simplify user_admin() callback
Update test to standardize on Add user account rather than Add user per Jen
Merge branch 'clouseau-clouseau-detangle-user-form' into 1.x