diff --git a/account.py b/account.py
index 05c388f64a..d984948c2b 100644
--- a/account.py
+++ b/account.py
@@ -24,8 +24,8 @@ class Account(ModelSQL, ModelView):
     active = fields.Boolean('Active', select=True)
     company = fields.Many2One('company.company', 'Company')
     currency = fields.Many2One('currency.currency', 'Currency', required=True)
-    currency_digits = fields.Function(fields.Integer('Currency Digits',
-        on_change_with=['currency']), 'on_change_with_currency_digits')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+        'on_change_with_currency_digits')
     type = fields.Selection([
         ('root', 'Root'),
         ('view', 'View'),
@@ -111,6 +111,7 @@ class Account(ModelSQL, ModelView):
         super(Account, cls).validate(accounts)
         cls.check_recursion(accounts)
 
+    @fields.depends('currency')
     def on_change_with_currency_digits(self, name=None):
         if self.currency:
             return self.currency.digits
diff --git a/line.py b/line.py
index 16b05d754f..9a0d984410 100644
--- a/line.py
+++ b/line.py
@@ -19,10 +19,10 @@ class Line(ModelSQL, ModelView):
         required=True, depends=['currency_digits'])
     credit = fields.Numeric('Credit', digits=(16, Eval('currency_digits', 2)),
         required=True, depends=['currency_digits'])
-    currency = fields.Function(fields.Many2One('currency.currency', 'Currency',
-        on_change_with=['move_line']), 'on_change_with_currency')
-    currency_digits = fields.Function(fields.Integer('Currency Digits',
-        on_change_with=['move_line']), 'on_change_with_currency_digits')
+    currency = fields.Function(fields.Many2One('currency.currency',
+            'Currency'), 'on_change_with_currency')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+        'on_change_with_currency_digits')
     account = fields.Many2One('analytic_account.account', 'Account',
             required=True, select=True, domain=[('type', '!=', 'view')])
     move_line = fields.Many2One('account.move.line', 'Account Move Line',
@@ -78,10 +78,12 @@ class Line(ModelSQL, ModelView):
     def default_credit():
         return Decimal(0)
 
+    @fields.depends('move_line')
     def on_change_with_currency(self, name=None):
         if self.move_line:
             return self.move_line.account.company.currency.id
 
+    @fields.depends('move_line')
     def on_change_with_currency_digits(self, name=None):
         if self.move_line:
             return self.move_line.account.company.currency.digits