diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 9bb63c938c4..d13188e6da0 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -9,12 +9,12 @@ from openerp.addons.website.controllers.main import template_values
 class contactus(http.Controller):
 
     @http.route(['/crm/contactus'], type='http', auth="db")
-    def contactus(self, *arg, **kwarg):
-        values = template_values()
+    def contactus(self, *arg, **post):
         cr = request.cr
         uid = request.session._uid or openerp.SUPERUSER_ID
-
-        html = request.registry.get("ir.ui.view").render(cr, uid, "website_crm.contactus", self.get_values())
+        post['user_id'] = False
+        request.registry['crm.lead'].create(cr, uid, post)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_crm.thanks", template_values())
         return html
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 17eaa602ae2..792e06c1562 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -8,14 +8,44 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='span8']" position="inside">
                     <form action="/crm/contactus" method="post">
-                        <input name="name" required="True" placeholder="Name..."/><br/>
+                        <input name="contact_name" required="True" placeholder="Name..."/><br/>
                         <input name="phone" type="tel" required="True" placeholder="Phone number..."/><br/>
-                        <input name="email" type="email" required="True" placeholder="Email..."/>
+                        <input name="email_from" type="email" required="True" placeholder="Email..."/>
+                        <input name="name" required="True" placeholder="Subject..."/><br/>
                         <textarea name="description" placeholder="Enter your comment..."> </textarea>
                         <button>Send message</button>
                     </form>
                 </xpath>
             </field>
         </record>
+
+        <record id="thanks" model="ir.ui.view">
+            <field name="name">thanks</field>
+            <field name="type">qweb</field>
+            <field name="arch" type="xml">
+                <t t-call="website.layout">
+                    <t t-set="title">Contact us - <t t-esc="res_company.name"/></t>
+                    <div class="container">
+                        <div class="row">
+                            <div class="span8">
+                                <h1>Thanks for your message</h1>
+                            </div>
+                            <div class="span4">
+                                <address>
+                                    <strong t-esc="res_company.name">Name</strong><br/>
+                                    <t t-esc="res_company.street"/><br/>
+                                    <t t-esc="res_company.city"/>, <t t-esc="res_company.zip"/><br/>
+                                    <t t-esc="res_company.country_id and res_company.country_id.name_get()[0][1]"/><br/>
+                                    <br/>
+                                    &amp;#x2706; <t t-esc="res_company.phone"/><br/>
+                                    <i class="icon-envelope"></i> <t t-esc="res_company.email"/>
+                                </address>
+                                <img t-att-src="google_map_url"/>
+                            </div>
+                        </div>
+                    </div>
+                </t>
+            </field>
+        </record>
      </data>
 </openerp>