diff --git a/www/src/app/pages/admin/organizations/components/config-list.controller.js b/www/src/app/pages/admin/organizations/components/config-list.controller.js
index 6f0e2297e..76a146cf3 100644
--- a/www/src/app/pages/admin/organizations/components/config-list.controller.js
+++ b/www/src/app/pages/admin/organizations/components/config-list.controller.js
@@ -18,6 +18,10 @@ export default class OrganizationConfigsController {
     };
   }
 
+  isSet(config) {
+    return _.indexOf([undefined, null, ''], config) === -1;
+  }
+
   edit(config) {
     let modal = this.$uibModal.open({
       controller: ConfigurationEditController,
@@ -26,11 +30,11 @@ export default class OrganizationConfigsController {
       size: 'lg',
       resolve: {
         configuration: () => {
-          let defaultValues = {
-            string: null,
-            number: 0,
-            boolean: true
-          };
+          // let defaultValues = {
+          //   string: null,
+          //   number: 0,
+          //   boolean: true
+          // };
           let conf = angular.copy(config);
 
           _.forEach(conf.configurationItems, item => {
diff --git a/www/src/app/pages/admin/organizations/components/config-list.html b/www/src/app/pages/admin/organizations/components/config-list.html
index 41ef27e78..dd068cd71 100644
--- a/www/src/app/pages/admin/organizations/components/config-list.html
+++ b/www/src/app/pages/admin/organizations/components/config-list.html
@@ -40,8 +40,8 @@ <h4 class="media-heading">
             <div ng-repeat="item in config.configurationItems">
               <small class="mr-xxs">
                  <strong><i class="mr-xxs fa" ng-class="{
-                   'fa-check text-success': config.config[item.name] !== undefined,
-                   'fa-times text-danger': config.config[item.name] === undefined
+                   'fa-check text-success': $ctrl.isSet(config.config[item.name]),
+                   'fa-times text-danger': !$ctrl.isSet(config.config[item.name])
                   }"></i> {{item.name}}:</strong> {{item.description}}
                   <span ng-if="item.defaultValue">(<em>Default:</em> {{item.defaultValue}})</span>
               </small>