Fix for non-admin users