wip
some fixes on adminuser