diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py
index 40724866..9da2b867 100644
--- a/src/Site/SiteManager.py
+++ b/src/Site/SiteManager.py
@@ -102,7 +102,7 @@ class SiteManager(object):
 
         s = time.time()
         if data:
-            helper.atomicWrite("%s/sites.json" % config.data_dir, json.dumps(data, indent=2, sort_keys=True).encode())
+            helper.atomicWrite("%s/sites.json" % config.data_dir, helper.jsonDumps(data).encode("utf8"))
         else:
             self.log.debug("Save error: No data")
         time_write = time.time() - s
diff --git a/src/User/User.py b/src/User/User.py
index 2557abc0..dbcfc56f 100644
--- a/src/User/User.py
+++ b/src/User/User.py
@@ -45,7 +45,7 @@ class User(object):
         user_data["sites"] = self.sites
         user_data["certs"] = self.certs
         user_data["settings"] = self.settings
-        helper.atomicWrite("%s/users.json" % config.data_dir, json.dumps(users, indent=2, sort_keys=True).encode("utf8"))
+        helper.atomicWrite("%s/users.json" % config.data_dir, helper.jsonDumps(users).encode("utf8"))
         self.log.debug("Saved in %.3fs" % (time.time() - s))
         self.delayed_save_thread = None