diff --git a/vc_vidyo/indico_vc_vidyo/templates/info_box.html b/vc_vidyo/indico_vc_vidyo/templates/info_box.html
index b54864f..2e9c395 100644
--- a/vc_vidyo/indico_vc_vidyo/templates/info_box.html
+++ b/vc_vidyo/indico_vc_vidyo/templates/info_box.html
@@ -1,3 +1,5 @@
+{% set owner = retrieve_principal(vc_room.data['owner']) %}
+{% set phone_link = settings.get('vidyo_phone_link') %}
 <dl>
     <dt>{% trans %}Description{% endtrans %}</dt>
     <dd>{{ vc_room.data.description }}</dd>
@@ -6,7 +8,7 @@
         <dd>{{ vc_room.data.extension }}</dd>
     {% endif %}
     <dt>{% trans %}Moderator{% endtrans %}</dt>
-    <dd>{{ moderator.getFullName() }}</dd>
+    <dd>{{ owner.getFullName() }}</dd>
     <dt>{% trans %}Linked to{% endtrans %}</dt>
     <dd>
         {% if event_vc_room.link_type.name == 'event' %}
diff --git a/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html b/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html
new file mode 100644
index 0000000..df6ebda
--- /dev/null
+++ b/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html
@@ -0,0 +1,7 @@
+{% set vc_room = event_vc_room.vc_room %}
+<div class="toolbar right">
+    <div class="group">
+        <a class="i-button i-button-small event-service-right-button highlight join-button" href="{{ vc_room.data.url }}"><strong>{% trans %}Join{% endtrans %}</strong></a>
+    </div>
+</div>
+<!-- TODO: Add template hook for RAVEM "Connect" button -->