Updating default users
major refactoring of client side code