diff --git a/bin/lamassu-apply-defaults b/bin/lamassu-apply-defaults
index 0e2eea61..01fa271b 100755
--- a/bin/lamassu-apply-defaults
+++ b/bin/lamassu-apply-defaults
@@ -4,13 +4,11 @@ const _ = require('lodash/fp')
 
 // const db = require('../lib/db')
 const settingsLoader = require('../lib/settings-loader')
-const configManager = require('../lib/config-manager')
 const schema = require('../lamassu-schema.json')
 const newFields = []
 
-settingsLoader.loadLatest()
-.then(settings => {
-  const config = settings.config
+Promise.resolve()
+.then(() => {
   schema.groups.forEach(group => {
     return group.fields.forEach(fieldCode => {
       const field = schema.fields.find(r => r.code === fieldCode)
@@ -18,9 +16,6 @@ settingsLoader.loadLatest()
       if (_.isNil(field.default)) return
       if (group.cryptoScope === 'specific' || group.machineScope === 'specific') return
 
-      const existing = configManager.scopedValue('global', 'global', fieldCode, config)
-      if (!_.isNil(existing)) return
-
       return newFields.push({
         fieldLocator: {
           fieldScope: {
@@ -39,7 +34,7 @@ settingsLoader.loadLatest()
     })
   })
 
-  return settingsLoader.save({config: config.concat(newFields)})
+  return settingsLoader.save(newFields)
 })
 .then(() => {
   console.log('Success.')
diff --git a/lib/config-validate.js b/lib/config-validate.js
index b0c66578..6cf61bb7 100644
--- a/lib/config-validate.js
+++ b/lib/config-validate.js
@@ -151,8 +151,7 @@ function validate (config) {
   .then(() => validateRequires(config))
   .then(arr => {
     if (arr.length === 0) return config
-    logger.error('Invalid configuration: %j', arr)
-    throw new Error('Invalid configuration')
+    throw new Error('Invalid configuration:' + arr)
   })
 }