diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 492c397754d..b0d519e51c3 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -81,6 +81,7 @@
         'base_demo.xml',
         'res/partner/partner_demo.xml',
         'res/partner/crm_demo.xml',
+        'res/res_widget_demo.xml',
     ],
     'test': [
         'test/base_test.xml',
diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 14b7338bde0..1d9a688655e 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -35,21 +35,23 @@ class res_widget_user(osv.osv):
     _columns = {
         'sequence': fields.integer('Sequence'),
         'user_id': fields.many2one('res.users','User', select=1),
-        'widget_id': fields.many2one('res.widget','Widget',required=1),
+        'widget_id': fields.many2one('res.widget','Widget',required=True),
     }
 res_widget_user()
 
 class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
-    _description = "Add a widget"
+    _description = "Add a widget for User"
     _columns = {
-        'widget_id': fields.one2many("res.widget", 'Widget', required=True),
+        'widget_id': fields.many2many("res.widget",
+                                      "res_widget_user_rel", "uid", "wid",
+                                      "Widget"),
     }
-    def widget_add(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        wizard = self.read(cr, uid, ids)[0]
-        self.pool.get('res.widget.user').create(cr, uid, {'user_id':uid, 'widget_id':wizard['widget_id']})
-        return {}
-res_widget_wizard()
 
+    def res_widget_add(self, cr, uid, ids, context=None):
+        wizard = self.read(cr, uid, ids, context=context)[0]
+        for wiz_id in wizard['widget_id']:
+            self.pool.get('res.widget.user').create(
+                cr, uid, {'user_id':uid, 'widget_id':wiz_id}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+res_widget_wizard()
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index a8375651b8a..1e64955da1a 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="openerp_twitter_favorites" model="res.widget">
+    <record id="openerp_favorites_twitter_widget" model="res.widget">
       <field name="title">OpenERP Favorites</field>
       <field name="content"><![CDATA[
 <script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
@@ -38,5 +38,194 @@ new TWTR.Widget({
 }).render().setUser('openerp').start();
 </script>]]> </field>
     </record>
+
+    <record id="odony_twitter_widget" model="res.widget">
+      <field name="title">Olivier Dony's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('odony').start();
+</script>]]></field>
+    </record>
+
+    <record id="matrixise_twitter_widget" model="res.widget">
+      <field name="title">Stéphane Wirtel's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('matrixise').start();
+</script>]]></field>
+    </record>
+
+    <record id="rvalyi_twitter_widget" model="res.widget">
+      <field name="title">Raphaël Valyi's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('rvalyi').start();
+</script>]]></field>
+    </record>
+
+    <record id="albertnan_twitter_widget" model="res.widget">
+      <field name="title">Albert Cervera Areny's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('albertnan').start();
+</script>]]></field>
+    </record>
+
+    <record id="nhomar_twitter_widget" model="res.widget">
+      <field name="title">Nhomar Hernandez's tweets</field>
+      <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#9A0404'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('nhomar').start();
+</script>]]></field>
+    </record>
+
+    <record id="openerp_favorites" model="res.widget.user">
+        <field name="widget_id" ref="openerp_favorites_twitter_widget"/>
+    </record>
   </data>
 </openerp>
diff --git a/bin/addons/base/res/res_widget_demo.xml b/bin/addons/base/res/res_widget_demo.xml
new file mode 100644
index 00000000000..6ffe9bfb182
--- /dev/null
+++ b/bin/addons/base/res/res_widget_demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="openerp_admin_widgets" model="res.widget.user">
+        <field name="widget_id" ref="odony_twitter_widget"/>
+        <field name="user_id" ref="base.user_root"/>
+    </record>
+    <record id="openerp_demo_widgets" model="res.widget.user">
+        <field name="widget_id" ref="albertnan_twitter_widget"/>
+        <field name="user_id" ref="base.user_demo"/>
+    </record>
+  </data>
+</openerp>
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index b139f774f9b..91b108257dc 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -75,20 +75,25 @@
         <menuitem action="res_widget_user_act_window" id="menu_res_widget_user_act_window" parent="base.next_id_2"
             groups="base.group_no_one"/>
 
-<!--
         <record id="view_res_widget_wizard" model="ir.ui.view">
-            <field name="name">Res Widget Wizard</field>
+            <field name="name">Homepage Widgets Management</field>
             <field name="model">res.widget.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Res Widget" col="4">
-                <field name="res_widget"/>
+              <form string="Widget Wizard" col="4">
+                <field name="widget_id"/>
                 <newline/>
-                <button name="res_widget_add" string="Add Widget" type="object"/>
+                <separator string="" colspan="6"/>
+                <group colspan="6" col="4" >
+                  <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                  <button name="res_widget_add" string="Add" type="object"/>
+                </group>
             </form>
             </field>
         </record>
-        <act_window name="Res Widget Wizard" res_model="res.widget.wizard" src_model="res.widget.user" view_mode="form" target="new" key2="client_action_multi" id="action_res_widget_wizard"/>
--->
+        <act_window name="Homepage Widgets Management"
+                    res_model="res.widget.wizard" src_model="res.widget.user"
+                    view_mode="form" target="new" key2="client_action_multi"
+                    id="action_res_widget_wizard"/>
     </data>
 </openerp>