diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index e35e8225469..0eceec3f46b 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -94,27 +94,21 @@ class wizard(osv.osv_memory):
             return {    # a user config based on a contact (address)
                 'name': address.name,
                 'user_email': extract_email(address.email),
-                'lang': address.partner_id and address.partner_id.lang or 'en_US',
-                'partner_id': address.partner_id and address.partner_id.id,
+                'lang': address.parent_id and address.parent_id.lang or 'en_US',
+                'partner_id': address.parent_id and address.parent_id.id,
             }
         
         user_ids = []
-        if context.get('active_model') == 'res.partner.address':
-            address_obj = self.pool.get('res.partner.address')
-            address_ids = context.get('active_ids', [])
-            addresses = address_obj.browse(cr, uid, address_ids, context)
-            user_ids = map(create_user_from_address, addresses)
-        
-        elif context.get('active_model') == 'res.partner':
+        if context.get('active_model') == 'res.partner':
             partner_obj = self.pool.get('res.partner')
             partner_ids = context.get('active_ids', [])
             partners = partner_obj.browse(cr, uid, partner_ids, context)
             for p in partners:
                 # add one user per contact, or one user if no contact
-                if p.address:
-                    user_ids.extend(map(create_user_from_address, p.address))
+                if p.child_ids:
+                    user_ids.extend(map(create_user_from_address, p.child_ids))
                 else:
-                    user_ids.append({'lang': p.lang or 'en_US', 'partner_id': p.id})
+                    user_ids.append({'lang': p.lang or 'en_US', 'parent_id': p.id})
         
         return user_ids
 
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 537055e5fb2..7f36272720c 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -10,15 +10,6 @@
             key2="client_action_multi" target="new"
             groups="group_portal_officer"/>
 
-        <!-- wizard action on res.partner.address -->
-        <act_window id="address_wizard_action"
-            name="Add Portal Access"
-            src_model="res.partner.address"
-            res_model="res.portal.wizard"
-            view_type="form" view_mode="form"
-            key2="client_action_multi" target="new"
-            groups="group_portal_officer"/>
-
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">
             <field name="name">Add Portal Access</field>