diff --git a/src/templates/realm/realm_groups.jinja2 b/src/templates/realm/realm_groups.jinja2
index ecb383c..40a0650 100644
--- a/src/templates/realm/realm_groups.jinja2
+++ b/src/templates/realm/realm_groups.jinja2
@@ -13,7 +13,12 @@
         <tbody>
         {% for group in realm_groups %}
             <tr>
-                <td><a href="{{ url('realm-group-detail', args=[realm.id, group.dn]) }}">{{ group.name }}</a></td>
+                <td><a href="{{ url('realm-group-detail', args=[realm.id, group.dn]) }}"
+                       data-toggle="tooltip"
+                       data-placement="right"
+                       title="{{ group.description }}"
+                >{{ group.name }}</a>
+                </td>
                 <td>{{ group.dn }}</td>
                 <td>{{ group.members|length }}</td>
             </tr>
diff --git a/src/templates/user/realm_user_detail.jinja2 b/src/templates/user/realm_user_detail.jinja2
index 260d3bf..899be53 100644
--- a/src/templates/user/realm_user_detail.jinja2
+++ b/src/templates/user/realm_user_detail.jinja2
@@ -19,12 +19,15 @@
             <li class="list-group-item">Passwort: <a
                     href="{{ url('realm-user-password-reset', args = [realm.id, user.dn]) }}" class="float-right">Nutzerpasswort
                 zurücksetzen</a></li>
-            {#            <li class="list-group-item">Telefon: {{ user.phone }}</li>#}
-            {#            <li class="list-group-item">Mobiltelefon: {{ user.mobile_phone }}</li>#}
+            <li class="list-group-item">Telefon: {{ user.phone }}</li>
+            <li class="list-group-item">Mobiltelefon: {{ user.mobile_phone }}</li>
             <li class="list-group-item">Gruppen:
                 {% if groups %}
                     {% for group in groups %}
                         <a href="{{ url('realm-group-detail', args=[realm.id, group.dn]) }}"
+                           data-toggle="tooltip"
+                           data-placement="right"
+                           title="{{ group.description }}"
                            class="badge badge-secondary p-1">{{ group.name }}</a>
                     {% endfor %}
                 {% else %}
@@ -35,10 +38,10 @@
             </li>
             <li class="list-group-item">Zuletzt eingeloggt:
                 {% if user.last_login %}
-                {{ user.last_login.strftime('%d.%m.%Y') }}
-            {% else %}
-                <i class="far fa-times-circle text-danger"></i><span class="d-none">+</span>
-            {% endif %}</li>
+                    {{ user.last_login.strftime('%d.%m.%Y') }}
+                {% else %}
+                    <i class="far fa-times-circle text-danger"></i><span class="d-none">+</span>
+                {% endif %}</li>
         </ul>
         <div class="d-flex mt-3">
             <a href="{{ url('realm-user-update', args = [realm.id, user.dn]) }}" class="btn btn-primary mr-auto p-2">
diff --git a/src/templates/user/user_detail.jinja2 b/src/templates/user/user_detail.jinja2
index a702949..75d5902 100644
--- a/src/templates/user/user_detail.jinja2
+++ b/src/templates/user/user_detail.jinja2
@@ -15,7 +15,10 @@
                                     <li class="list-group-item">
                                         <span class="font-weight-bold">Gruppen:</span>
                                         {% for group in groups %}
-                                            <span class="badge badge-primary p-1">{{ group.name }}</span>
+                                            <span class="badge badge-primary p-1" data-toggle="tooltip"
+                                                  data-placement="right"
+                                                  title="{{ group.description }}"
+                                            >{{ group.name }}</span>
                                         {% endfor %}
                                     </li>
                                 {% endif %}