diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8afb67b6195..03d731d70f5 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -487,6 +487,9 @@ class account_bank_statement_line(osv.osv):
 		company_currency_id = res_users_obj.browse(cursor, user, user,
 				context=context).company_id.currency_id.id
 
+		if not currency_id:
+			currency_id = company_currency_id
+
 		part = self.pool.get('res.partner').browse(cursor, user, partner_id,
 				context=context)
 		if type == 'supplier':
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 751b945e517..b6a26d5491d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -341,7 +341,7 @@
 							<field name="date"/>
 							<field name="name"/>
 							<field name="type"/>
-							<field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+							<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
 							<field name="account_id" domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"/>
 							<field name="amount"/>
 							<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>