Adding the ability to optionally specify client id and secret in the client configuration file