diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 99222d8589e..6a47cfee840 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -300,6 +300,10 @@ class Website(models.Model):
     def is_user(self):
         return self.env['ir.model.access'].check('ir.ui.menu', 'read', False)
 
+    @api.model
+    def is_public_user(self):
+        return request.env.user.id == request.website.user_id.id
+
     @api.model
     def get_template(self, template):
         View = self.env['ir.ui.view']
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 5b66f5dbd4a..56075501a40 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1142,8 +1142,7 @@
                                 <t t-if="mode == ('new', 'billing')">
                                     <h3 class="page-header mt32 ml16">Your Address
                                         <small> or </small>
-                                        <t t-set='connect' t-value="request.env['ir.config_parameter'].sudo().get_param('auth_signup.allow_uninvited') == 'True' and ('signup', 'Sign Up') or ('login', 'Log In')"/>
-                                        <a t-attf-href='/web/{{connect[0]}}?redirect=/shop/checkout' class='btn btn-primary' style="margin-top: -11px"><t t-esc='connect[1]'/></a>
+                                        <a href='/web/login?redirect=/shop/checkout' class='btn btn-primary' style="margin-top: -11px">Log In</a>
                                     </h3>
                                 </t>
                                 <t t-if="mode == ('edit', 'billing')">
@@ -1502,6 +1501,12 @@
                                         </tbody>
                                     </table>
                                     <t t-call="website_sale.payment_confirmation_status" />
+                                    <t t-if="request.env['ir.config_parameter'].sudo().get_param('auth_signup.allow_uninvited') == 'True' and request.website.is_public_user()">
+                                        <p class='alert alert-info mt16'>
+                                            <a t-att-href='order.partner_id.signup_prepare() and order.partner_id.signup_url' class='btn btn-primary'>Sign Up</a>
+                                             Now to Follow Your Order
+                                        </p>
+                                    </t>
                                 </div>
                             </div>
                             <div class="col-md-3 hidden-sm hidden-xs text-muted">