Fixed bug in retrieving client id when using HTTP Basic client
credentials.