Fix bug with non-admin rights users