diff --git a/addons/portal/wizard.py b/addons/portal/wizard.py
index fbd78e2a988..e961e890d64 100644
--- a/addons/portal/wizard.py
+++ b/addons/portal/wizard.py
@@ -144,7 +144,7 @@ class wizard(osv.osv_memory):
                     logging.getLogger('res.portal.wizard').warning(
                         'Failed to send email from %s to %s', email_from, email_to)
         
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 wizard()
 
diff --git a/addons/portal/wizard_view.xml b/addons/portal/wizard_view.xml
index 5c3b095aa1e..86a789e760c 100644
--- a/addons/portal/wizard_view.xml
+++ b/addons/portal/wizard_view.xml
@@ -40,9 +40,12 @@
             <field name="model">res.portal.wizard.user</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Portal Users">
+                <!-- the attribute 'editable' is set below to make the elements
+                     editable in the web client 6.0 -->
+                <tree string="Portal Users" editable="bottom">
                     <field name="name"/>
                     <field name="email"/>
+                    <field name="lang"/>
                     <field name="partner_id"/>
                 </tree>
             </field>