Fix non admin configuration