- improved user management (revs #1)