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