diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 5a3c8c6577b..8b6601b4d37 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -4,7 +4,7 @@ import SiteSetting from 'admin/models/site-setting';
 import { propertyNotEqual } from 'discourse/lib/computed';
 import computed from 'ember-addons/ember-computed-decorators';
 
-const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list'];
+const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list'];
 
 export default Ember.Component.extend(BufferedContent, ScrollTop, {
   classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'],
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
new file mode 100644
index 00000000000..caaf3739d74
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs
@@ -0,0 +1,3 @@
+{{value-list values=value}}
+{{setting-validation-message message=validationMessage}}
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 3f613dda987..c4fe63b8763 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -21,7 +21,18 @@ module SiteSettingExtension
   end
 
   def types
-    @types ||= Enum.new(:string, :time, :fixnum, :float, :bool, :null, :enum, :list, :url_list, :host_list, :category_list)
+    @types ||= Enum.new(:string,
+                        :time,
+                        :fixnum,
+                        :float,
+                        :bool,
+                        :null,
+                        :enum,
+                        :list,
+                        :url_list,
+                        :host_list,
+                        :category_list,
+                        :value_list)
   end
 
   def mutex