diff --git a/module/gitlab/js/managegroupmembers.js b/module/gitlab/js/managegroupmembers.js
index 589e0ffc61..e8fdb17736 100644
--- a/module/gitlab/js/managegroupmembers.js
+++ b/module/gitlab/js/managegroupmembers.js
@@ -43,4 +43,19 @@ function deleteItem(obj)
 {
     if($('#teamForm .table tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
\ No newline at end of file
+}
+
+$(document).on('change', '[id^="levels"]', function()
+{
+    $next = $(this).closest('td').next()
+    if($(this).val() == '50')
+    {
+        $next.prepend('<input type="text" value="" class="form-control disabled" disabled autocomplete="off" />');
+        $next.find('[id^="expires"]').addClass('hidden');
+    }
+    else
+    {
+        $next.find('[id^="expires"]').removeClass('hidden');
+        $next.find('input.disabled').remove();
+    }
+})
diff --git a/module/gitlab/view/managegroupmembers.html.php b/module/gitlab/view/managegroupmembers.html.php
index 648d13210e..3821ad265d 100644
--- a/module/gitlab/view/managegroupmembers.html.php
+++ b/module/gitlab/view/managegroupmembers.html.php
@@ -25,7 +25,12 @@
           <td><?php echo html::input("names[$i]", $member->name, "class='form-control' readonly");?></td>
           <td><?php echo html::select("levels[$i]", array(''=>'') + $this->lang->gitlab->accessLevels, $member->access_level, "class='form-control chosen'");?></td>
           <td>
+            <?php if($member->access_level == '50'):?>
+            <input type="text" value="" class="form-control disabled" disabled autocomplete="off" />
+            <?php echo html::input("expires[$i]", $member->expires_at, "class='form-control form-date hidden'");?>
+            <?php else:?>
             <?php echo html::input("expires[$i]", $member->expires_at, "class='form-control form-date'");?>
+            <?php endif;?>
             <?php echo html::hidden("ids[$i]", $member->id);?>
           </td>
           <td class='c-actions text-center'>