diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 077de6ebe7..1b8419a479 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -314,7 +314,7 @@ class gitlab extends control
         }
 
         $groups      = $this->gitlab->apiGetGroups($gitlabID, $orderBy);
-        $adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, $this->config->gitlab->accessLevel['owner']);
+        $adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, $this->config->gitlab->accessLevel['maintainer']);
 
         $adminGropuIDList = array();
         foreach($adminGroups as $group) $adminGropuIDList[] = $group->id;
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 2bef5fad79..b1347f604e 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -155,7 +155,7 @@ class gitlabModel extends model
     {
         if(!$account) $account = $this->app->user->account;
 
-        return $this->dao->select('providerID')->from(TABLE_OAUTH)
+        return $this->dao->select('providerID,openID')->from(TABLE_OAUTH)
             ->where('providerType')->eq('gitlab')
             ->andWhere('account')->eq($account)
             ->fetchPairs('providerID');
diff --git a/module/gitlab/view/browsegroup.html.php b/module/gitlab/view/browsegroup.html.php
index c0d515f526..9bf643b6ca 100644
--- a/module/gitlab/view/browsegroup.html.php
+++ b/module/gitlab/view/browsegroup.html.php
@@ -55,7 +55,7 @@
           <td class='text' title='<?php echo substr($gitlabGroup->created_at, 0, 10);?>'><?php echo substr($gitlabGroup->created_at, 0, 10);?></td>
           <td class='c-actions text-left'>
             <?php
-            $adminClass = in_array($gitlabGroup->id, $adminGropuIDList) ? '' : 'disabled';
+            $adminClass = ($app->user->admin or in_array($gitlabGroup->id, $adminGropuIDList)) ? '' : 'disabled';
             common::printLink('gitlab', 'manageGroupMembers', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-team'></i> ", '',"title='{$lang->gitlab->group->manageMembers}' class='btn btn-primary'");
             common::printLink('gitlab', 'editGroup', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-edit'></i> ", '', "title='{$lang->gitlab->group->edit}' class='btn btn-primary {$adminClass}'");
             if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteGroup', "gitlabID=$gitlabID&groupID=$gitlabGroup->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteGroup}' class='btn {$adminClass}'");