Issue#401 user management