diff --git a/src/domaindb.js b/src/domaindb.js
index e8e8f794f..f46998846 100644
--- a/src/domaindb.js
+++ b/src/domaindb.js
@@ -53,14 +53,14 @@ function getAll(callback) {
     });
 }
 
-function add(domain, zoneName, provider, config, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof provider, 'string');
-    assert.strictEqual(typeof config, 'object');
+function add(name, domain, callback) {
+    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain.zoneName, 'string');
+    assert.strictEqual(typeof domain.provider, 'string');
+    assert.strictEqual(typeof domain.config, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('INSERT INTO domains (domain, zoneName, provider, configJson) VALUES (?, ?, ?, ?)', [ domain, zoneName, provider, JSON.stringify(config) ], function (error) {
+    database.query('INSERT INTO domains (domain, zoneName, provider, configJson) VALUES (?, ?, ?, ?)', [ name, domain.zoneName, domain.provider, JSON.stringify(domain.config) ], function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
@@ -120,7 +120,7 @@ function clear(callback) {
 function addDefaultDomain(callback) {
     assert(config.fqdn(), 'no fqdn set in config, cannot continue');
 
-    add(config.fqdn(), config.zoneName(), 'manual', { }, function (error) {
+    add(config.fqdn(), { zoneName: config.zoneName(), provider: 'manual', config: { } }, function (error) {
         if (error && error.reason !== DatabaseError.ALREADY_EXISTS) return callback(error);
         callback();
     });
diff --git a/src/domains.js b/src/domains.js
index afcc97ef5..458574280 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -125,7 +125,7 @@ function add(domain, zoneName, provider, config, fallbackCertificate, callback)
             if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
             if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
-            domaindb.add(domain, zoneName, provider, result, function (error) {
+            domaindb.add(domain, { zoneName: zoneName, provider: provider, config: result }, function (error) {
                 if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainError(DomainError.ALREADY_EXISTS));
                 if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index 71b45e5ea..7347c1dc4 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -138,7 +138,7 @@ describe('Apps', function () {
             database.initialize,
             database._clear,
             // DOMAIN_0 already added for test through domaindb.addDefaultDomain()
-            domaindb.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config),
+            domaindb.add.bind(null, DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config }),
             userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
             userdb.add.bind(null, USER_0.id, USER_0),
             userdb.add.bind(null, USER_1.id, USER_1),
diff --git a/src/test/database-test.js b/src/test/database-test.js
index e9b2d4c34..1d3b0a8d3 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -103,15 +103,15 @@ describe('database', function () {
         };
 
         it('can add domain', function (done) {
-            domaindb.add(DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, done);
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
         });
 
         it('can add another domain', function (done) {
-            domaindb.add(DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, done);
+            domaindb.add(DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config }, done);
         });
 
         it('cannot add same domain twice', function (done) {
-            domaindb.add(DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, function (error) {
+            domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, function (error) {
                 expect(error).to.be.ok();
                 expect(error.reason).to.be(DatabaseError.ALREADY_EXISTS);
                 done();