Revert "Merge pull request #1961 from howaboutwe/1960_pluralize_generated_admin_user"

This reverts commit 02851874a0374115964ad3f8c252854bfc005e8d, reversing
changes made to 3e685688c9787ea01b8e1ad940a0d7326837356f.