Do you need these changes for ClientImpl not properly storing username as described in pull request.