diff --git a/addons/account/company.py b/addons/account/company.py
index 04a2611fe7d..2e210626495 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -63,19 +63,25 @@ class company_setup(osv.osv_memory):
     }
 
     def onchange_company_id(self, cr, uid, ids, company, context=None):
-        res = {}
         if not company:
             return {}
         comp_obj = self.pool.get('res.company').browse(cr,uid,company)
-        res['partner_id'] = comp_obj.partner_id.id
-        phone = comp_obj.partner_id.address and (comp_obj.partner_id.address[0].phone and ' at ' + str(comp_obj.partner_id.address[0].phone) + '.' or '.') or '.'
-        res['overdue_msg'] = comp_obj.overdue_msg + str(phone)
-        
-        return {'value': res }
+        partner_address = comp_obj.partner_id.address
+        if partner_address and partner_address[0].phone:
+            msg_tail = ' at %s.'%(partner_address[0].phone)
+        else:
+            msg_tail = '.'
+
+        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail,
+                          'partner_id': comp_obj.partner_id.id } }
 
     def execute(self, cr, uid, ids, context=None):
-        content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
+        content_wiz = self.pool.get('wizard.company.setup')\
+            .read(cr,uid,ids,['company_id','overdue_msg'])
         if content_wiz:
             wiz_data = content_wiz[0]
-            self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
+            self.pool.get('res.company').write(
+                cr, uid,
+                [wiz_data['company_id']],
+                {'overdue_msg':wiz_data['overdue_msg']})
 company_setup()