diff --git a/server_environment/serv_config.py b/server_environment/serv_config.py
index b5dc9549a45..bdd84179a2c 100644
--- a/server_environment/serv_config.py
+++ b/server_environment/serv_config.py
@@ -247,12 +247,14 @@ def fields_view_get(self, cr, uid, view_id=None, view_type='form',
         return res
 
     @api.model
-    def _is_secret(self, key):
+    def _is_secret(self, cr, uid, key=None, context=None):
         """
         This method is intended to be inherited to defined which keywords
         should be secret.
         :return: list of secret keywords
         """
+        if key is None:
+            key = []
         secret_keys = ['passw', 'key', 'secret', 'token']
         return any(secret_key in key for secret_key in secret_keys)
 
@@ -265,7 +267,7 @@ def default_get(self, cr, uid, fields_list, context=None):
             return res
         for key in self._conf_defaults:
             if not self.show_passwords and self._is_secret(
-                    cr, uid, context=context, key=key):
+                    cr, uid, key=key, context=context):
                 res[key] = '**********'
             else:
                 res[key] = self._conf_defaults[key]()