diff --git a/config/config.sample.php b/config/config.sample.php
index 9cff1a4b87..60c184306d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1548,4 +1548,9 @@ $CONFIG = array(
  */
 'gs.federation' => 'internal',
 
+/**
+ * show group membership on the personal page
+ */
+'settings.personal.showGroupMembership' => true
+
 );
diff --git a/settings/personal.php b/settings/personal.php
index 5a6ff76208..458d1e8d42 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -160,6 +160,7 @@ if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 $uid = $user->getUID();
 $userData = $accountManager->getUser($user);
 
+$tmpl->assign('showGroupMembership', $config->getSystemValue('settings.personal.showGroupMembership', true));
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('quota', $storageInfo['quota']);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index f1e2458e55..d3d45910af 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -239,6 +239,7 @@
 </div>
 </div>
 
+<?php if ($_['showGroupMembership'] === true): ?>
 <div id="groups" class="section">
 	<h2><?php p($l->t('Groups')); ?></h2>
 	<p><?php p($l->t('You are member of the following groups:')); ?></p>
@@ -246,6 +247,7 @@
 	<?php p(implode(', ', $_['groups'])); ?>
 	</p>
 </div>
+<?php endif; ?>
 
 <?php
 if($_['passwordChangeSupported']) {