diff --git a/settings/personal.php b/settings/personal.php
index f181c9cb2c117467b744c38c48cca9d4476d3ea5..7239df365f52c556a708af1d4a34364e42e8dfad 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -100,6 +100,12 @@ $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true));
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
 $tmpl->assign('certs', $certificateManager->listCertificates());
 
+// Get array of group ids for this user
+$groups = \OC::$server->getGroupManager()->getUserIdGroups(OC_User::getUser());
+$groups2 = array_map(function($group) { return $group->getGID(); }, $groups);
+sort($groups2);
+$tmpl->assign('groups', $groups2);
+
 // add hardcoded forms from the template
 $l = OC_L10N::get('settings');
 $formsAndMore = array();
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 3bd5971f44e71f85e924406f502d7d22b74265e9..02e61287937983c173e726dda4ff3b4a0fa10269 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -136,6 +136,14 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
+<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>
+	<p>
+	<?php p(implode(', ', $_['groups'])); ?>
+	</p>
+</div>
+
 <?php if ($_['enableAvatars']): ?>
 <form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
 	<h2><?php p($l->t('Profile picture')); ?></h2>