diff --git a/src/OAuth2/AuthServer.php b/src/OAuth2/AuthServer.php
index 534a816c..483d137c 100644
--- a/src/OAuth2/AuthServer.php
+++ b/src/OAuth2/AuthServer.php
@@ -446,7 +446,13 @@ class AuthServer
     public function getParam($param = '', $method = 'get', $inputParams = array(), $default = null)
     {
         if (is_string($param)) {
-            return (isset($inputParams[$param])) ? $inputParams[$param] : $this->getRequest()->{$method}($param, $default);
+            if(isset($inputParams[$param])) {
+                return $inputParams[$param];
+            } elseif($param == 'client_id' && !is_null($client_id = $this->getRequest()->server('PHP_AUTH_USER'))) {
+                return $client_id;
+            } elseif($param == 'client_secret' && !is_null($client_secret = $this->getRequest()->server('PHP_AUTH_PW'))) {
+                return $client_secret;
+            } else return $this->getRequest()->{$method}($param, $default);
         } else {
             $response = array();
             foreach ($param as $p) {