diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 0394dcf3f96..8b5bf7d5b9f 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <template id="contactus_form" name="Contact Form (Opportunity)" inherit_id="website_form.contactus_form" customize_show="True">
+            <xpath expr="//span[@data-for='contactus_form']" position="before">
+                <t t-set="logged_partner" t-value="request.env['website.visitor']._get_visitor_from_request().partner_id"/>
+            </xpath>
             <xpath expr="//span[@data-for='contactus_form']" position="attributes">
                 <attribute name="t-att-data-values">{
-                    'contact_name': request.params.get('contact_name', ''),
-                    'phone': request.params.get('phone', ''),
-                    'email_from': request.params.get('email_from', ''),
-                    'partner_name': request.params.get('partner_name', ''),
+                    'contact_name': request.params.get('contact_name', logged_partner.name if logged_partner else ''),
+                    'phone': request.params.get('phone', logged_partner.phone if logged_partner and logged_partner.phone else ''),
+                    'email_from': request.params.get('email_from', logged_partner.email if logged_partner else ''),
+                    'partner_name': request.params.get('partner_name', logged_partner.commercial_company_name if logged_partner else ''),
                     'name': request.params.get('name', ''),
                     'description': request.params.get('description', ''),
                 }</attribute>
@@ -63,6 +66,7 @@
                                         <div class="row s_col_no_resize s_col_no_bgcolor">
                                             <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity5">
                                                 <span class="s_website_form_label_content">Subject</span>
+                                                <span class="s_website_form_mark"> *</span>
                                             </label>
                                             <div class="col-sm">
                                                 <input id="opportunity5" type="text" class="form-control s_website_form_input" name="name" required="" />