diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index f919a422f4b..e9fb9c5930f 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -386,7 +386,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr>
+                <tr t-if="event.state == 'confirm'">
                     <td>Event Subscription</td>
                     <td>
                         <t t-if="event.date_begin">
@@ -409,7 +409,14 @@
                  </tr>
             </tbody>
         </table>
-        <button type="submit" t-if="event.seats_availability == 'unlimited' or event.seats_available" class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Register Now</button>
+        <button type="submit" t-if="event.state == 'confirm' and (event.seats_availability == 'unlimited' or event.seats_available)"
+            class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Register Now</button>
+        <div t-if="not event.state == 'confirm'" class="alert alert-info">
+            Event registration not yet started. 
+            <t t-if="uid">
+                <i class="fa fa-plus-circle"><a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event"> <em>Configure and Launch Event Registration</em></a></i>
+            </t>
+        </div>
     </form>
 </template>
 
@@ -439,15 +446,15 @@
                                 </h4>
                                 <div class="row">
                                     <div class="col-md-4"><strong>Name</strong></div>
+                                    <div class="col-md-5"><strong>Email</strong></div>
                                     <div class="col-md-3"><strong>Phone</strong> <span class="text-muted">(Optional)</span></div>
-                                    <div class="col-md-5"><strong>Email</strong> <span class="text-muted">(Optional)</span></div>
                                 </div>
                                 <t t-foreach="range(1, ticket['quantity'] + 1)" t-as="att_counter" name="attendee_loop">
                                     <t t-set="counter" t-value="counter + 1"/>
                                     <div class="row mb4">
                                         <div class="col-md-4"><input class='form-control' type='text' t-attf-name="#{counter}-name" required="This field is required" t-att-placeholder="'Attendee #%s' %counter"/></div>
+                                        <div class="col-md-5"><input class='form-control' type='email' t-attf-name="#{counter}-email" required="This field is required"/></div>
                                         <div class="col-md-3"><input class='form-control' type='tel' t-attf-name="#{counter}-phone"/></div>
-                                        <div class="col-md-5"><input class='form-control' type='email' t-attf-name="#{counter}-email"/></div>
                                         <input class='hidden' type='text' t-attf-name="#{counter}-ticket_id" t-attf-value="#{ticket['id']}"/>
                                     </div>
                                 </t>
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index 9a5e045c359..2f08bebdd29 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -74,15 +74,8 @@
         </tbody>
     </xpath>
     <xpath expr="//button[@type='submit']" position="replace">
-        <button type="submit" t-if="event.seats_available or event.seats_availability == 'unlimited'" class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Order Now</button>
-        <form t-if="not event.event_ticket_ids">
-            <div class="alert alert-info">
-                Event registration not yet started. 
-                <t t-if="uid">
-                    <i class="fa fa-plus-circle"><a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event"> <em>Configure Event Registration</em></a></i>
-                </t>
-            </div>
-        </form>
+        <button type="submit" t-if="event.state == 'confirm' and (event.seats_available or event.seats_availability == 'unlimited')"
+            class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Order Now</button>
     </xpath>
 </template>