Change class Client to User