Fixed bug with non admin user