[bug 883533] Added tolerance for non-admin users when appropriate

Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=883533