Bug fixes for non-admin users
4.0.0-rc3