added master user handling