diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
index 2cf39b0..b18eb10 100644
--- a/Controller/GrouperGroupsController.php
+++ b/Controller/GrouperGroupsController.php
@@ -68,7 +68,7 @@ public function beforeFilter()
     //Need to find which plugin instance choosing, if more than one from cm_co_grouper_lites
     // table being used in COmanage.
     $grouperConnData = $this->Session->read('Plugin.Grouper.Api');
-    if ($this->Session->check('Plugin.Grouper.Api.id') && count($grouperConnData) == 9) {
+    if ($this->Session->check('Plugin.Grouper.Api.id') && count($grouperConnData) == 10) {
       if (isset($this->passedArgs['glid'])) {
         if ($this->Session->read('Plugin.Grouper.Api.id') !== $this->passedArgs['glid']) {
           $this->setConnection();
@@ -83,6 +83,10 @@ public function beforeFilter()
       $this->setConnection();
     }
 
+    //Also check for CO of Organization
+    if (!$this->Session->check('Plugin.Grouper.Api.id')) {
+      $this->Session->write('Plugin.Grouper.Api.co', $this->passedArgs['co']);
+    }
   }
 
   /**
@@ -91,6 +95,7 @@ public function beforeFilter()
   private function setConnection()
   {
     $this->Session->write('Plugin.Grouper.Api.id', $this->passedArgs['glid']);
+    $this->Session->write('Plugin.Grouper.Api.co', $this->passedArgs['co']);
 
     //Now get the setup Dasboard instance from db for connection info.
     $getConnInfo = new CoGrouperLite();
@@ -439,7 +444,8 @@ public function groupOwner()
     $config = [
       "defaultCollapse" => CakeSession::read('Plugin.Grouper.Api.defaultCollapse'),
       "adHocHeading" => CakeSession::read('Plugin.Grouper.Api.adHocHeading'),
-      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading')
+      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading'),
+      'co' => CakeSession::read('Plugin.Grouper.Api.co')
     ];
     $this->set('config', $config);
   }
@@ -513,7 +519,8 @@ public function groupMember()
     $config = [
       "defaultCollapse" => CakeSession::read('Plugin.Grouper.Api.defaultCollapse'),
       "adHocHeading" => CakeSession::read('Plugin.Grouper.Api.adHocHeading'),
-      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading')
+      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading'),
+      'co' => CakeSession::read('Plugin.Grouper.Api.co')
     ];
     $this->set('config', $config);
   }
@@ -585,7 +592,8 @@ public function groupOptin()
     $config = [
       "defaultCollapse" => CakeSession::read('Plugin.Grouper.Api.defaultCollapse'),
       "adHocHeading" => CakeSession::read('Plugin.Grouper.Api.adHocHeading'),
-      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading')
+      "wgHeading" => CakeSession::read('Plugin.Grouper.Api.wgHeading'),
+      'co' => CakeSession::read('Plugin.Grouper.Api.co')
     ];
     $this->set('config', $config);
   }