diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 7e85925b1c9..059a674e5f1 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -53,6 +53,8 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
+        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+            help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
         'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 7a0aa615b2d..59841b6988e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -71,6 +71,18 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <div name="linkedin">
+                        <separator string="Social Network Integration"/>
+                        <group name="LinkedIn">
+                            <label for="id" string="Contacts"/>
+                            <div name="LinkedIn">
+                                <div name="module_web_linkedin" class="oe_inline">
+                                    <field name="module_web_linkedin"/>
+                                    <label for="module_web_linkedin"/>
+                                </div>
+                            </div>
+                        </group>
+                    </div>
                     <div name="customer feature">
                         <separator string="Quotations and Sales Orders"/>
                         <group name="Customer">
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f0b987b369f..8a590fc318f 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -101,8 +101,8 @@ class res_users(osv.osv):
         self.message_subscribe(cr, uid, [user_id], [user_id], context=context)
         # create a welcome message
         company_name = user.company_id.name if user.company_id else _('the company')
-        message = _('%s has joined %s! Welcome to OpenERP !') % (user.name, company_name)
-        self.message_append_note(cr, uid, [user_id], subject='Welcome to OpenERP', body=message, type='comment', context=context)
+        message = _('%s joined the %s network! Take a moment to welcome %s.') % (user.name, company_name, user.name)
+        self.message_append_note(cr, uid, [user_id], body=message, type='comment', context=context)
         return user_id
     
     def write(self, cr, uid, ids, vals, context=None):