diff --git a/mpicms/templates/base/blocks/contact_block.html b/mpicms/templates/base/blocks/contact_block.html
index e296b2d..3a21a9e 100644
--- a/mpicms/templates/base/blocks/contact_block.html
+++ b/mpicms/templates/base/blocks/contact_block.html
@@ -25,7 +25,7 @@
             {% if value.contact.room %}
                 <tr>
                     <td><i class="fas fa-building"></i></td>
-                    <td><a href="{% room_link value.contact.room %}">{{ value.contact.room }}</td>
+                    <td>{{ value.contact.room | add_room_links }}</td>
                 </tr>
             {% endif %}
         </table>
diff --git a/mpicms/templates/events/event.html b/mpicms/templates/events/event.html
index 7f7efc6..73b4f33 100644
--- a/mpicms/templates/events/event.html
+++ b/mpicms/templates/events/event.html
@@ -38,10 +38,10 @@ <h2 class="title is-2">{{ page.title }}</h2>
 
 
         {% if page.room %}
-            <a href="{% room_link page.room %}" class="tag is-medium">
+            <div class="tag is-medium">
                 <i class="fa fa-building"></i>
-                {{ page.room }}
-            </a>
+                {{ page.room | add_room_links }}
+            </div>
         {% endif %}
 
     </div>
@@ -58,4 +58,4 @@ <h2 class="title is-2">{{ page.title }}</h2>
         </p>
     </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/mpicms/templates/personal/list.html b/mpicms/templates/personal/list.html
index 2cda009..e410f01 100644
--- a/mpicms/templates/personal/list.html
+++ b/mpicms/templates/personal/list.html
@@ -55,7 +55,7 @@ <h1 class="title has-text-centered">{% trans 'Contact List' %}</h1>
                 <td class="last_name">{{ contact.last_name }}</td>
                 <td class="email"><a href="mailto:{{ contact.email }}">{{ contact.email }}</a></td>
                 <td class="phone">{{ contact.phone }}</td>
-                <td class="room"><a href="{% room_link contact.room %}">{{ contact.room }}</a></td>
+                <td class="room">{{ contact.room | add_room_links }}</td>
                 <td class="positions">{% for contactposition in contact.positions.all %}{{ contactposition.position }}<br>{% endfor %}</td>
                 <td class="groups">{% for contactgroup in contact.groups.all %}{{ contactgroup.group }}<br>{% endfor %}</td>
             </tr>