diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 03bf395fc0b..2a0e429d292 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -26,6 +26,21 @@
     <record id="event_type_4" model="event.type">
         <field name="name">Training</field>
     </record>
+    
+<!-- Demo data for Address -->
+    <record id="res_partner_24" model="res.partner">
+            <field name="name">Epix Technosoft</field>
+            <field eval="[(6, 0, [ref('base.res_partner_category_2')])]" name="category_id"/>
+            <field name="is_company">1</field>
+            <field eval="0" name="customer"/>
+            <field name="country_id" ref="base.us"/>
+            <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
+            <field name="zip">90001</field>
+            <field name="city">Los Angeles</field>
+            <field name="email">epix@technosoft.info</field>
+            <field name="phone">+1 312 349 2121</field>
+            <field name="website">www.epixtechnosoft.info//</field>
+    </record>
 
 <!-- Demo data for Event -->
     <record id="event_0" model="event.event">
@@ -33,7 +48,7 @@
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
         <field name="register_max">500</field>
-        <field name="address_id" ref="base.res_partner_24"/>
+        <field name="address_id" ref="res_partner_24"/>
         <field name="type" ref="event_type_1"/>
     </record>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index c8cb07d3ece..6521808a3f2 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -162,7 +162,7 @@
                         <i class="icon-time"></i> <span t-field="event_id.date_end"> </span>
                         <t t-if="event_id.organizer_id">
                             <h6>Organized by:</h6>
-                            <address><strong t-field="event_id.organizer_id.name"/><t t-if="event_id.phone"><br/><span>&amp;#x2706;</span> <span t-field="event_id.phone"></span></t><t t-if="event_id.email"><br/><i class="icon-envelope"></i> <span t-field="event_id.email"></span></t></address>
+                            <address><strong t-field="event_id.organizer_id.display_name"/><t t-if="event_id.phone"><br/><span>&amp;#x2706;</span> <span t-field="event_id.phone"></span></t><t t-if="event_id.email"><br/><i class="icon-envelope"></i> <span t-field="event_id.email"></span></t></address>
                         </t>
                     </div>
                     <div class="col-md-8">
@@ -203,7 +203,7 @@
                         <ul class="media-list" id="comment">
                             <li t-foreach="message_ids" t-as="comment" class="media">
                                 <div class="media-body">
-                                    <!--t t-call="website.publish"><t t-set="object" t-value="comment"/></t-->
+                                    <t t-call="website.publish"><t t-set="object" t-value="comment"/></t>
                                     <t t-raw="comment.body"/>
                                     <small class="pull-right muted text-right">
                                         <div t-field="comment.author_id"/>