Comment 32 for bug 1354208

Another nit I should have mentioned before:

change "allow non-admin user to" to "allow non-admin users to" (add s), or "allow a non-admin user to" (add a), either one works for me.

The rest works looks good to me.