diff --git a/examples/relational/Storage/ScopeStorage.php b/examples/relational/Storage/ScopeStorage.php
index 674fc6d9..9b50ae28 100644
--- a/examples/relational/Storage/ScopeStorage.php
+++ b/examples/relational/Storage/ScopeStorage.php
@@ -13,7 +13,7 @@ class ScopeStorage extends Adapter implements ScopeInterface
     /**
      * {@inheritdoc}
      */
-    public function get($scope, $grantType = null)
+    public function get($scope, $grantType = null, $clientId = null)
     {
         $result = Capsule::table('oauth_scopes')
                                 ->where('id', $scope)
diff --git a/src/Grant/AuthCodeGrant.php b/src/Grant/AuthCodeGrant.php
index d2cb0cde..eef3d045 100644
--- a/src/Grant/AuthCodeGrant.php
+++ b/src/Grant/AuthCodeGrant.php
@@ -215,6 +215,8 @@ class AuthCodeGrant extends AbstractGrant
         }
 
         $session = $code->getSession();
+        $session->associateClient($client);
+
         $authCodeScopes = $code->getScopes();
 
         // Generate the access token