Updated the client users message handling