Fixed client id mismatch caused by it incorrectly using the username
rather than the client id.