diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 2522039ebca..65a8034951f 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -8,7 +8,7 @@ class event(osv.osv):
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'description_website': fields.html('Description for the website'),
-        'product_ids': fields.one2many('event.event.product', "event_id", "Event"),
+        'event_product_ids': fields.one2many('event.event.product', "event_id", "Event"),
         'organizer_id': fields.many2one('res.partner', "Orgonizer"),
         'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
         'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 7e74251659b..65ff07fa9dd 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -173,20 +173,28 @@
                                 <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                 <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
                             </a>
-                            <h4 t-if="event_id.product_ids">Ticket Information</h4>
-                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.product_ids">
-                                <div t-foreach="event_id.product_ids" t-as="prod">
-                                    <span t-field="prod.product_id"/>
-                                    <span t-field="prod.deadline"/>
-                                    <span t-field="prod.price"/>
-                                    <span t-field="prod.qty"/>
-                                    <span t-field="prod.max_qty"/>
-                                    <select t-att-name="'product[%%s]' %% prod.id">
-                                        <t t-foreach="range(0,10)" t-as="nb">
-                                            <option t-esc="nb"/>
-                                        </t>
-                                    </select>
-                                </div>
+                            <h4 t-if="event_id.event_product_ids">Ticket Information</h4>
+                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.event_product_ids">
+                                <table class="table">
+                                    <tr>
+                                        <th>Ticket type</th>
+                                        <th>Sales End</th>
+                                        <th>Price</th>
+                                        <th>Seats</th>
+                                        <th>Quantity</th>
+                                    </tr>
+                                    <tr t-foreach="event_id.event_product_ids" t-as="prod">
+                                        <td t-field="prod.product_id"/>
+                                        <td t-field="prod.deadline"/>
+                                        <td t-field="prod.price"/>
+                                        <td><span t-if="prod.max_qty"><t t-esc="prod.qty"/>/<t t-field="prod.max_qty"/></span></td>
+                                        <td>
+                                            <select t-att-name="'product[%%s]' %% prod.id">
+                                                <t t-foreach="range(0,10)" t-as="nb"><option t-esc="nb"/></t>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                </table>
                                 <button type="submit" class="btn btn-primary">Order Now</button>
                             </form>
                             <h4>Event Details</h4>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 3c7a577fe9e..e59d4a06ec1 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -64,7 +64,7 @@
                                 </ul>
                             </li>
                             <form action="./subscribe" method="POST" class="form-inline" t-if="not subscribe">
-                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == request.public_uid"/>
+                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == website.get_public_uid()"/>
                                 <button type="submit" class="btn btn-primary" name="subscribe">Subscribe</button>
                             </form>
                             <form action="./unsubscribe" method="POST" class="form-inline" t-if="subscribe">