2 files changed, 16 insertions, 2 deletions
diff --git a/src/leap/services/eip/eipconfig.py b/src/leap/services/eip/eipconfig.py
index da44c3a6..d69e1fd8 100644
--- a/src/leap/services/eip/eipconfig.py
+++ b/src/leap/services/eip/eipconfig.py
@@ -137,7 +137,14 @@ class EIPConfig(BaseConfig):
     def __init__(self):
         BaseConfig.__init__(self)
         self._api_version = None
-        self._get_schema = get_schema
+
+    def _get_schema(self):
+        """
+        Returns the schema corresponding to the version given.
+
+        :rtype: dict or None if the version is not supported.
+        """
+        return get_schema(self._api_version)
 
     def get_clusters(self):
         # TODO: create an abstraction for clusters
diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/services/mail/smtpconfig.py
index ca974fcf..ea0f9c37 100644
--- a/src/leap/services/mail/smtpconfig.py
+++ b/src/leap/services/mail/smtpconfig.py
@@ -33,7 +33,14 @@ class SMTPConfig(BaseConfig):
 
     def __init__(self):
         BaseConfig.__init__(self)
-        self._get_schema = get_schema
+
+    def _get_schema(self):
+        """
+        Returns the schema corresponding to the version given.
+
+        :rtype: dict or None if the version is not supported.
+        """
+        return get_schema(self._api_version)
 
     def get_hosts(self):
         return self._safe_get_value("hosts")