added support for user management to server and client