diff --git a/src/Controllers/AuthorizationCallbackController.php b/src/Controllers/AuthorizationCallbackController.php
index ef9cf06..cc2943a 100755
--- a/src/Controllers/AuthorizationCallbackController.php
+++ b/src/Controllers/AuthorizationCallbackController.php
@@ -26,9 +26,18 @@ public function __invoke(Request $request, OauthCredentialManager $oauth, Identi
 
             $accessToken = $provider->getAccessToken('authorization_code', $request->only('code'));
             $identity->getConfig()->setAccessToken((string)$accessToken->getToken());
-            $tenantId = $identity->getConnections()[0]->getTenantId();
 
-            $oauth->store($accessToken, $tenantId);
+            //Iterate tenants
+            $tenants = array();
+            foreach($identity->getConnections() as $c) {
+                $tenants[] = [
+                    "Id" => $c->getTenantId(),
+                    "Name"=> $c->getTenantName()
+                ];
+            }
+
+            //Store Token and Tenants
+            $oauth->store($accessToken, $tenants);
             Event::dispatch(new XeroAuthorized($oauth->getData()));
 
             return $this->onSuccess();