add master and fix user