diff --git a/CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue b/CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue
index a6b655c9..c7bddb73 100644
--- a/CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue
+++ b/CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue
@@ -33,7 +33,9 @@ export default {
   components: {
     Field
   },
-  props: {},
+  props: {
+    type: String
+  },
   data: function() {
     return {
       fields: []
@@ -41,7 +43,7 @@ export default {
   },
   methods: {
     loadFields: function() {
-      CTFd.fetch("/api/v1/configs/fields?type=user", {
+      CTFd.fetch(`/api/v1/configs/fields?type=${this.type}`, {
         method: "GET",
         credentials: "same-origin",
         headers: {
@@ -59,7 +61,7 @@ export default {
     addField: function() {
       this.fields.push({
         id: Math.random(),
-        type: "user",
+        type: this.type,
         field_type: "text",
         name: "",
         description: "",
diff --git a/CTFd/themes/admin/assets/js/pages/configs.js b/CTFd/themes/admin/assets/js/pages/configs.js
index dd5ac87a..4646774e 100644
--- a/CTFd/themes/admin/assets/js/pages/configs.js
+++ b/CTFd/themes/admin/assets/js/pages/configs.js
@@ -363,9 +363,22 @@ $(() => {
     })
     .change();
 
-  // Insert CommentBox element
+  // Insert FieldList element for users
   const fieldList = Vue.extend(FieldList);
-  let vueContainer = document.createElement("div");
-  document.querySelector("#user-field-list").appendChild(vueContainer);
-  new fieldList({}).$mount(vueContainer);
+  let userVueContainer = document.createElement("div");
+  document.querySelector("#user-field-list").appendChild(userVueContainer);
+  new fieldList({
+    propsData: {
+      type: "user"
+    }
+  }).$mount(userVueContainer);
+
+  // Insert FieldList element for teams
+  let teamVueContainer = document.createElement("div");
+  document.querySelector("#team-field-list").appendChild(teamVueContainer);
+  new fieldList({
+    propsData: {
+      type: "team"
+    }
+  }).$mount(teamVueContainer);
 });
diff --git a/CTFd/themes/admin/static/js/components.dev.js b/CTFd/themes/admin/static/js/components.dev.js
index 39a8ef9a..3cecd3be 100644
--- a/CTFd/themes/admin/static/js/components.dev.js
+++ b/CTFd/themes/admin/static/js/components.dev.js
@@ -188,7 +188,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n
 /***/ (function(module, exports, __webpack_require__) {
 
 ;
-eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports.default = void 0;\n\nvar _CTFd = _interopRequireDefault(__webpack_require__(/*! core/CTFd */ \"./CTFd/themes/core/assets/js/CTFd.js\"));\n\nvar _Field = _interopRequireDefault(__webpack_require__(/*! ./Field.vue */ \"./CTFd/themes/admin/assets/js/components/configs/fields/Field.vue\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nvar _default = {\n  name: \"FieldList\",\n  components: {\n    Field: _Field.default\n  },\n  props: {},\n  data: function data() {\n    return {\n      fields: []\n    };\n  },\n  methods: {\n    loadFields: function loadFields() {\n      var _this = this;\n\n      _CTFd.default.fetch(\"/api/v1/configs/fields?type=user\", {\n        method: \"GET\",\n        credentials: \"same-origin\",\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\"\n        }\n      }).then(function (response) {\n        return response.json();\n      }).then(function (response) {\n        _this.fields = response.data;\n      });\n    },\n    addField: function addField() {\n      this.fields.push({\n        id: Math.random(),\n        type: \"user\",\n        field_type: \"text\",\n        name: \"\",\n        description: \"\",\n        editable: false,\n        required: false,\n        public: false\n      });\n    },\n    removeField: function removeField(index) {\n      this.fields.splice(index, 1);\n      console.log(this.fields);\n    }\n  },\n  created: function created() {\n    this.loadFields();\n  }\n};\nexports.default = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue?./node_modules/babel-loader/lib??ref--0!./node_modules/vue-loader/lib??vue-loader-options");
+eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\nexports.default = void 0;\n\nvar _CTFd = _interopRequireDefault(__webpack_require__(/*! core/CTFd */ \"./CTFd/themes/core/assets/js/CTFd.js\"));\n\nvar _Field = _interopRequireDefault(__webpack_require__(/*! ./Field.vue */ \"./CTFd/themes/admin/assets/js/components/configs/fields/Field.vue\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nvar _default = {\n  name: \"FieldList\",\n  components: {\n    Field: _Field.default\n  },\n  props: {\n    type: String\n  },\n  data: function data() {\n    return {\n      fields: []\n    };\n  },\n  methods: {\n    loadFields: function loadFields() {\n      var _this = this;\n\n      _CTFd.default.fetch(\"/api/v1/configs/fields?type=\".concat(this.type), {\n        method: \"GET\",\n        credentials: \"same-origin\",\n        headers: {\n          Accept: \"application/json\",\n          \"Content-Type\": \"application/json\"\n        }\n      }).then(function (response) {\n        return response.json();\n      }).then(function (response) {\n        _this.fields = response.data;\n      });\n    },\n    addField: function addField() {\n      this.fields.push({\n        id: Math.random(),\n        type: this.type,\n        field_type: \"text\",\n        name: \"\",\n        description: \"\",\n        editable: false,\n        required: false,\n        public: false\n      });\n    },\n    removeField: function removeField(index) {\n      this.fields.splice(index, 1);\n      console.log(this.fields);\n    }\n  },\n  created: function created() {\n    this.loadFields();\n  }\n};\nexports.default = _default;\n\n//# sourceURL=webpack:///./CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue?./node_modules/babel-loader/lib??ref--0!./node_modules/vue-loader/lib??vue-loader-options");
 
 /***/ }),
 
diff --git a/CTFd/themes/admin/static/js/pages/configs.dev.js b/CTFd/themes/admin/static/js/pages/configs.dev.js
index 3e239d5a..20c8dea2 100644
--- a/CTFd/themes/admin/static/js/pages/configs.dev.js
+++ b/CTFd/themes/admin/static/js/pages/configs.dev.js
@@ -162,7 +162,7 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 ;
-eval("\n\n__webpack_require__(/*! ./main */ \"./CTFd/themes/admin/assets/js/pages/main.js\");\n\n__webpack_require__(/*! core/utils */ \"./CTFd/themes/core/assets/js/utils.js\");\n\n__webpack_require__(/*! bootstrap/js/dist/tab */ \"./node_modules/bootstrap/js/dist/tab.js\");\n\nvar _momentTimezone = _interopRequireDefault(__webpack_require__(/*! moment-timezone */ \"./node_modules/moment-timezone/index.js\"));\n\nvar _CTFd = _interopRequireDefault(__webpack_require__(/*! core/CTFd */ \"./CTFd/themes/core/assets/js/CTFd.js\"));\n\nvar _helpers = _interopRequireDefault(__webpack_require__(/*! core/helpers */ \"./CTFd/themes/core/assets/js/helpers.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nvar _ezq = __webpack_require__(/*! core/ezq */ \"./CTFd/themes/core/assets/js/ezq.js\");\n\nvar _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ \"./node_modules/codemirror/lib/codemirror.js\"));\n\n__webpack_require__(/*! codemirror/mode/htmlmixed/htmlmixed.js */ \"./node_modules/codemirror/mode/htmlmixed/htmlmixed.js\");\n\nvar _vueEsm = _interopRequireDefault(__webpack_require__(/*! vue/dist/vue.esm.browser */ \"./node_modules/vue/dist/vue.esm.browser.js\"));\n\nvar _FieldList = _interopRequireDefault(__webpack_require__(/*! ../components/configs/fields/FieldList.vue */ \"./CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction loadTimestamp(place, timestamp) {\n  if (typeof timestamp == \"string\") {\n    timestamp = parseInt(timestamp, 10);\n  }\n\n  var m = (0, _momentTimezone.default)(timestamp * 1000);\n  (0, _jquery.default)(\"#\" + place + \"-month\").val(m.month() + 1); // Months are zero indexed (http://momentjs.com/docs/#/get-set/month/)\n\n  (0, _jquery.default)(\"#\" + place + \"-day\").val(m.date());\n  (0, _jquery.default)(\"#\" + place + \"-year\").val(m.year());\n  (0, _jquery.default)(\"#\" + place + \"-hour\").val(m.hour());\n  (0, _jquery.default)(\"#\" + place + \"-minute\").val(m.minute());\n  loadDateValues(place);\n}\n\nfunction loadDateValues(place) {\n  var month = (0, _jquery.default)(\"#\" + place + \"-month\").val();\n  var day = (0, _jquery.default)(\"#\" + place + \"-day\").val();\n  var year = (0, _jquery.default)(\"#\" + place + \"-year\").val();\n  var hour = (0, _jquery.default)(\"#\" + place + \"-hour\").val();\n  var minute = (0, _jquery.default)(\"#\" + place + \"-minute\").val();\n  var timezone = (0, _jquery.default)(\"#\" + place + \"-timezone\").val();\n  var utc = convertDateToMoment(month, day, year, hour, minute);\n\n  if (isNaN(utc.unix())) {\n    (0, _jquery.default)(\"#\" + place).val(\"\");\n    (0, _jquery.default)(\"#\" + place + \"-local\").val(\"\");\n    (0, _jquery.default)(\"#\" + place + \"-zonetime\").val(\"\");\n  } else {\n    (0, _jquery.default)(\"#\" + place).val(utc.unix());\n    (0, _jquery.default)(\"#\" + place + \"-local\").val(utc.local().format(\"dddd, MMMM Do YYYY, h:mm:ss a zz\"));\n    (0, _jquery.default)(\"#\" + place + \"-zonetime\").val(utc.tz(timezone).format(\"dddd, MMMM Do YYYY, h:mm:ss a zz\"));\n  }\n}\n\nfunction convertDateToMoment(month, day, year, hour, minute) {\n  var month_num = month.toString();\n\n  if (month_num.length == 1) {\n    month_num = \"0\" + month_num;\n  }\n\n  var day_str = day.toString();\n\n  if (day_str.length == 1) {\n    day_str = \"0\" + day_str;\n  }\n\n  var hour_str = hour.toString();\n\n  if (hour_str.length == 1) {\n    hour_str = \"0\" + hour_str;\n  }\n\n  var min_str = minute.toString();\n\n  if (min_str.length == 1) {\n    min_str = \"0\" + min_str;\n  } // 2013-02-08 24:00\n\n\n  var date_string = year.toString() + \"-\" + month_num + \"-\" + day_str + \" \" + hour_str + \":\" + min_str + \":00\";\n  return (0, _momentTimezone.default)(date_string, _momentTimezone.default.ISO_8601);\n}\n\nfunction updateConfigs(event) {\n  event.preventDefault();\n  var obj = (0, _jquery.default)(this).serializeJSON();\n  var params = {};\n\n  if (obj.mail_useauth === false) {\n    obj.mail_username = null;\n    obj.mail_password = null;\n  } else {\n    if (obj.mail_username === \"\") {\n      delete obj.mail_username;\n    }\n\n    if (obj.mail_password === \"\") {\n      delete obj.mail_password;\n    }\n  }\n\n  Object.keys(obj).forEach(function (x) {\n    if (obj[x] === \"true\") {\n      params[x] = true;\n    } else if (obj[x] === \"false\") {\n      params[x] = false;\n    } else {\n      params[x] = obj[x];\n    }\n  });\n\n  _CTFd.default.api.patch_config_list({}, params).then(function (_response) {\n    window.location.reload();\n  });\n}\n\nfunction uploadLogo(event) {\n  event.preventDefault();\n  var form = event.target;\n\n  _helpers.default.files.upload(form, {}, function (response) {\n    var f = response.data[0];\n    var params = {\n      value: f.location\n    };\n\n    _CTFd.default.fetch(\"/api/v1/configs/ctf_logo\", {\n      method: \"PATCH\",\n      body: JSON.stringify(params)\n    }).then(function (response) {\n      return response.json();\n    }).then(function (response) {\n      if (response.success) {\n        window.location.reload();\n      } else {\n        (0, _ezq.ezAlert)({\n          title: \"Error!\",\n          body: \"Logo uploading failed!\",\n          button: \"Okay\"\n        });\n      }\n    });\n  });\n}\n\nfunction removeLogo() {\n  (0, _ezq.ezQuery)({\n    title: \"Remove logo\",\n    body: \"Are you sure you'd like to remove the CTF logo?\",\n    success: function success() {\n      var params = {\n        value: null\n      };\n\n      _CTFd.default.api.patch_config({\n        configKey: \"ctf_logo\"\n      }, params).then(function (_response) {\n        window.location.reload();\n      });\n    }\n  });\n}\n\nfunction importConfig(event) {\n  event.preventDefault();\n  var import_file = document.getElementById(\"import-file\").files[0];\n  var form_data = new FormData();\n  form_data.append(\"backup\", import_file);\n  form_data.append(\"nonce\", _CTFd.default.config.csrfNonce);\n  var pg = (0, _ezq.ezProgressBar)({\n    width: 0,\n    title: \"Upload Progress\"\n  });\n\n  _jquery.default.ajax({\n    url: _CTFd.default.config.urlRoot + \"/admin/import\",\n    type: \"POST\",\n    data: form_data,\n    processData: false,\n    contentType: false,\n    statusCode: {\n      500: function _(resp) {\n        alert(resp.responseText);\n      }\n    },\n    xhr: function xhr() {\n      var xhr = _jquery.default.ajaxSettings.xhr();\n\n      xhr.upload.onprogress = function (e) {\n        if (e.lengthComputable) {\n          var width = e.loaded / e.total * 100;\n          pg = (0, _ezq.ezProgressBar)({\n            target: pg,\n            width: width\n          });\n        }\n      };\n\n      return xhr;\n    },\n    success: function success(_data) {\n      pg = (0, _ezq.ezProgressBar)({\n        target: pg,\n        width: 100\n      });\n      setTimeout(function () {\n        pg.modal(\"hide\");\n      }, 500);\n      setTimeout(function () {\n        window.location.reload();\n      }, 700);\n    }\n  });\n}\n\nfunction exportConfig(event) {\n  event.preventDefault();\n  window.location.href = (0, _jquery.default)(this).attr(\"href\");\n}\n\nfunction insertTimezones(target) {\n  var current = (0, _jquery.default)(\"<option>\").text(_momentTimezone.default.tz.guess());\n  (0, _jquery.default)(target).append(current);\n\n  var tz_names = _momentTimezone.default.tz.names();\n\n  for (var i = 0; i < tz_names.length; i++) {\n    var tz = (0, _jquery.default)(\"<option>\").text(tz_names[i]);\n    (0, _jquery.default)(target).append(tz);\n  }\n}\n\n(0, _jquery.default)(function () {\n  var theme_header_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-header\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: \"htmlmixed\",\n    htmlMode: true\n  });\n\n  var theme_footer_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-footer\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: \"htmlmixed\",\n    htmlMode: true\n  });\n\n  var theme_settings_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-settings\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: {\n      name: \"javascript\",\n      json: true\n    }\n  }); // Handle refreshing codemirror when switching tabs.\n  // Better than the autorefresh approach b/c there's no flicker\n\n\n  (0, _jquery.default)(\"a[href='#theme']\").on(\"shown.bs.tab\", function (_e) {\n    theme_header_editor.refresh();\n    theme_footer_editor.refresh();\n    theme_settings_editor.refresh();\n  });\n  (0, _jquery.default)(\"#theme-settings-modal form\").submit(function (e) {\n    e.preventDefault();\n    theme_settings_editor.getDoc().setValue(JSON.stringify((0, _jquery.default)(this).serializeJSON(), null, 2));\n    (0, _jquery.default)(\"#theme-settings-modal\").modal(\"hide\");\n  });\n  (0, _jquery.default)(\"#theme-settings-button\").click(function () {\n    var form = (0, _jquery.default)(\"#theme-settings-modal form\");\n    var data; // Ignore invalid JSON data\n\n    try {\n      data = JSON.parse(theme_settings_editor.getValue());\n    } catch (e) {\n      data = {};\n    }\n\n    _jquery.default.each(data, function (key, value) {\n      var ctrl = form.find(\"[name='\".concat(key, \"']\"));\n\n      switch (ctrl.prop(\"type\")) {\n        case \"radio\":\n        case \"checkbox\":\n          ctrl.each(function () {\n            if ((0, _jquery.default)(this).attr(\"value\") == value) {\n              (0, _jquery.default)(this).attr(\"checked\", value);\n            }\n          });\n          break;\n\n        default:\n          ctrl.val(value);\n      }\n    });\n\n    (0, _jquery.default)(\"#theme-settings-modal\").modal();\n  });\n  insertTimezones((0, _jquery.default)(\"#start-timezone\"));\n  insertTimezones((0, _jquery.default)(\"#end-timezone\"));\n  insertTimezones((0, _jquery.default)(\"#freeze-timezone\"));\n  (0, _jquery.default)(\".config-section > form:not(.form-upload)\").submit(updateConfigs);\n  (0, _jquery.default)(\"#logo-upload\").submit(uploadLogo);\n  (0, _jquery.default)(\"#remove-logo\").click(removeLogo);\n  (0, _jquery.default)(\"#export-button\").click(exportConfig);\n  (0, _jquery.default)(\"#import-button\").click(importConfig);\n  (0, _jquery.default)(\"#config-color-update\").click(function () {\n    var hex_code = (0, _jquery.default)(\"#config-color-picker\").val();\n    var user_css = theme_header_editor.getValue();\n    var new_css;\n\n    if (user_css.length) {\n      var css_vars = \"theme-color: \".concat(hex_code, \";\");\n      new_css = user_css.replace(/theme-color: (.*);/, css_vars);\n    } else {\n      new_css = \"<style id=\\\"theme-color\\\">\\n\" + \":root {--theme-color: \".concat(hex_code, \";}\\n\") + \".navbar{background-color: var(--theme-color) !important;}\\n\" + \".jumbotron{background-color: var(--theme-color) !important;}\\n\" + \"</style>\\n\";\n    }\n\n    theme_header_editor.getDoc().setValue(new_css);\n  });\n  (0, _jquery.default)(\".start-date\").change(function () {\n    loadDateValues(\"start\");\n  });\n  (0, _jquery.default)(\".end-date\").change(function () {\n    loadDateValues(\"end\");\n  });\n  (0, _jquery.default)(\".freeze-date\").change(function () {\n    loadDateValues(\"freeze\");\n  });\n  var start = (0, _jquery.default)(\"#start\").val();\n  var end = (0, _jquery.default)(\"#end\").val();\n  var freeze = (0, _jquery.default)(\"#freeze\").val();\n\n  if (start) {\n    loadTimestamp(\"start\", start);\n  }\n\n  if (end) {\n    loadTimestamp(\"end\", end);\n  }\n\n  if (freeze) {\n    loadTimestamp(\"freeze\", freeze);\n  } // Toggle username and password based on stored value\n\n\n  (0, _jquery.default)(\"#mail_useauth\").change(function () {\n    (0, _jquery.default)(\"#mail_username_password\").toggle(this.checked);\n  }).change(); // Insert CommentBox element\n\n  var fieldList = _vueEsm.default.extend(_FieldList.default);\n\n  var vueContainer = document.createElement(\"div\");\n  document.querySelector(\"#user-field-list\").appendChild(vueContainer);\n  new fieldList({}).$mount(vueContainer);\n});\n\n//# sourceURL=webpack:///./CTFd/themes/admin/assets/js/pages/configs.js?");
+eval("\n\n__webpack_require__(/*! ./main */ \"./CTFd/themes/admin/assets/js/pages/main.js\");\n\n__webpack_require__(/*! core/utils */ \"./CTFd/themes/core/assets/js/utils.js\");\n\n__webpack_require__(/*! bootstrap/js/dist/tab */ \"./node_modules/bootstrap/js/dist/tab.js\");\n\nvar _momentTimezone = _interopRequireDefault(__webpack_require__(/*! moment-timezone */ \"./node_modules/moment-timezone/index.js\"));\n\nvar _CTFd = _interopRequireDefault(__webpack_require__(/*! core/CTFd */ \"./CTFd/themes/core/assets/js/CTFd.js\"));\n\nvar _helpers = _interopRequireDefault(__webpack_require__(/*! core/helpers */ \"./CTFd/themes/core/assets/js/helpers.js\"));\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nvar _ezq = __webpack_require__(/*! core/ezq */ \"./CTFd/themes/core/assets/js/ezq.js\");\n\nvar _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ \"./node_modules/codemirror/lib/codemirror.js\"));\n\n__webpack_require__(/*! codemirror/mode/htmlmixed/htmlmixed.js */ \"./node_modules/codemirror/mode/htmlmixed/htmlmixed.js\");\n\nvar _vueEsm = _interopRequireDefault(__webpack_require__(/*! vue/dist/vue.esm.browser */ \"./node_modules/vue/dist/vue.esm.browser.js\"));\n\nvar _FieldList = _interopRequireDefault(__webpack_require__(/*! ../components/configs/fields/FieldList.vue */ \"./CTFd/themes/admin/assets/js/components/configs/fields/FieldList.vue\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction loadTimestamp(place, timestamp) {\n  if (typeof timestamp == \"string\") {\n    timestamp = parseInt(timestamp, 10);\n  }\n\n  var m = (0, _momentTimezone.default)(timestamp * 1000);\n  (0, _jquery.default)(\"#\" + place + \"-month\").val(m.month() + 1); // Months are zero indexed (http://momentjs.com/docs/#/get-set/month/)\n\n  (0, _jquery.default)(\"#\" + place + \"-day\").val(m.date());\n  (0, _jquery.default)(\"#\" + place + \"-year\").val(m.year());\n  (0, _jquery.default)(\"#\" + place + \"-hour\").val(m.hour());\n  (0, _jquery.default)(\"#\" + place + \"-minute\").val(m.minute());\n  loadDateValues(place);\n}\n\nfunction loadDateValues(place) {\n  var month = (0, _jquery.default)(\"#\" + place + \"-month\").val();\n  var day = (0, _jquery.default)(\"#\" + place + \"-day\").val();\n  var year = (0, _jquery.default)(\"#\" + place + \"-year\").val();\n  var hour = (0, _jquery.default)(\"#\" + place + \"-hour\").val();\n  var minute = (0, _jquery.default)(\"#\" + place + \"-minute\").val();\n  var timezone = (0, _jquery.default)(\"#\" + place + \"-timezone\").val();\n  var utc = convertDateToMoment(month, day, year, hour, minute);\n\n  if (isNaN(utc.unix())) {\n    (0, _jquery.default)(\"#\" + place).val(\"\");\n    (0, _jquery.default)(\"#\" + place + \"-local\").val(\"\");\n    (0, _jquery.default)(\"#\" + place + \"-zonetime\").val(\"\");\n  } else {\n    (0, _jquery.default)(\"#\" + place).val(utc.unix());\n    (0, _jquery.default)(\"#\" + place + \"-local\").val(utc.local().format(\"dddd, MMMM Do YYYY, h:mm:ss a zz\"));\n    (0, _jquery.default)(\"#\" + place + \"-zonetime\").val(utc.tz(timezone).format(\"dddd, MMMM Do YYYY, h:mm:ss a zz\"));\n  }\n}\n\nfunction convertDateToMoment(month, day, year, hour, minute) {\n  var month_num = month.toString();\n\n  if (month_num.length == 1) {\n    month_num = \"0\" + month_num;\n  }\n\n  var day_str = day.toString();\n\n  if (day_str.length == 1) {\n    day_str = \"0\" + day_str;\n  }\n\n  var hour_str = hour.toString();\n\n  if (hour_str.length == 1) {\n    hour_str = \"0\" + hour_str;\n  }\n\n  var min_str = minute.toString();\n\n  if (min_str.length == 1) {\n    min_str = \"0\" + min_str;\n  } // 2013-02-08 24:00\n\n\n  var date_string = year.toString() + \"-\" + month_num + \"-\" + day_str + \" \" + hour_str + \":\" + min_str + \":00\";\n  return (0, _momentTimezone.default)(date_string, _momentTimezone.default.ISO_8601);\n}\n\nfunction updateConfigs(event) {\n  event.preventDefault();\n  var obj = (0, _jquery.default)(this).serializeJSON();\n  var params = {};\n\n  if (obj.mail_useauth === false) {\n    obj.mail_username = null;\n    obj.mail_password = null;\n  } else {\n    if (obj.mail_username === \"\") {\n      delete obj.mail_username;\n    }\n\n    if (obj.mail_password === \"\") {\n      delete obj.mail_password;\n    }\n  }\n\n  Object.keys(obj).forEach(function (x) {\n    if (obj[x] === \"true\") {\n      params[x] = true;\n    } else if (obj[x] === \"false\") {\n      params[x] = false;\n    } else {\n      params[x] = obj[x];\n    }\n  });\n\n  _CTFd.default.api.patch_config_list({}, params).then(function (_response) {\n    window.location.reload();\n  });\n}\n\nfunction uploadLogo(event) {\n  event.preventDefault();\n  var form = event.target;\n\n  _helpers.default.files.upload(form, {}, function (response) {\n    var f = response.data[0];\n    var params = {\n      value: f.location\n    };\n\n    _CTFd.default.fetch(\"/api/v1/configs/ctf_logo\", {\n      method: \"PATCH\",\n      body: JSON.stringify(params)\n    }).then(function (response) {\n      return response.json();\n    }).then(function (response) {\n      if (response.success) {\n        window.location.reload();\n      } else {\n        (0, _ezq.ezAlert)({\n          title: \"Error!\",\n          body: \"Logo uploading failed!\",\n          button: \"Okay\"\n        });\n      }\n    });\n  });\n}\n\nfunction removeLogo() {\n  (0, _ezq.ezQuery)({\n    title: \"Remove logo\",\n    body: \"Are you sure you'd like to remove the CTF logo?\",\n    success: function success() {\n      var params = {\n        value: null\n      };\n\n      _CTFd.default.api.patch_config({\n        configKey: \"ctf_logo\"\n      }, params).then(function (_response) {\n        window.location.reload();\n      });\n    }\n  });\n}\n\nfunction importConfig(event) {\n  event.preventDefault();\n  var import_file = document.getElementById(\"import-file\").files[0];\n  var form_data = new FormData();\n  form_data.append(\"backup\", import_file);\n  form_data.append(\"nonce\", _CTFd.default.config.csrfNonce);\n  var pg = (0, _ezq.ezProgressBar)({\n    width: 0,\n    title: \"Upload Progress\"\n  });\n\n  _jquery.default.ajax({\n    url: _CTFd.default.config.urlRoot + \"/admin/import\",\n    type: \"POST\",\n    data: form_data,\n    processData: false,\n    contentType: false,\n    statusCode: {\n      500: function _(resp) {\n        alert(resp.responseText);\n      }\n    },\n    xhr: function xhr() {\n      var xhr = _jquery.default.ajaxSettings.xhr();\n\n      xhr.upload.onprogress = function (e) {\n        if (e.lengthComputable) {\n          var width = e.loaded / e.total * 100;\n          pg = (0, _ezq.ezProgressBar)({\n            target: pg,\n            width: width\n          });\n        }\n      };\n\n      return xhr;\n    },\n    success: function success(_data) {\n      pg = (0, _ezq.ezProgressBar)({\n        target: pg,\n        width: 100\n      });\n      setTimeout(function () {\n        pg.modal(\"hide\");\n      }, 500);\n      setTimeout(function () {\n        window.location.reload();\n      }, 700);\n    }\n  });\n}\n\nfunction exportConfig(event) {\n  event.preventDefault();\n  window.location.href = (0, _jquery.default)(this).attr(\"href\");\n}\n\nfunction insertTimezones(target) {\n  var current = (0, _jquery.default)(\"<option>\").text(_momentTimezone.default.tz.guess());\n  (0, _jquery.default)(target).append(current);\n\n  var tz_names = _momentTimezone.default.tz.names();\n\n  for (var i = 0; i < tz_names.length; i++) {\n    var tz = (0, _jquery.default)(\"<option>\").text(tz_names[i]);\n    (0, _jquery.default)(target).append(tz);\n  }\n}\n\n(0, _jquery.default)(function () {\n  var theme_header_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-header\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: \"htmlmixed\",\n    htmlMode: true\n  });\n\n  var theme_footer_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-footer\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: \"htmlmixed\",\n    htmlMode: true\n  });\n\n  var theme_settings_editor = _codemirror.default.fromTextArea(document.getElementById(\"theme-settings\"), {\n    lineNumbers: true,\n    lineWrapping: true,\n    mode: {\n      name: \"javascript\",\n      json: true\n    }\n  }); // Handle refreshing codemirror when switching tabs.\n  // Better than the autorefresh approach b/c there's no flicker\n\n\n  (0, _jquery.default)(\"a[href='#theme']\").on(\"shown.bs.tab\", function (_e) {\n    theme_header_editor.refresh();\n    theme_footer_editor.refresh();\n    theme_settings_editor.refresh();\n  });\n  (0, _jquery.default)(\"#theme-settings-modal form\").submit(function (e) {\n    e.preventDefault();\n    theme_settings_editor.getDoc().setValue(JSON.stringify((0, _jquery.default)(this).serializeJSON(), null, 2));\n    (0, _jquery.default)(\"#theme-settings-modal\").modal(\"hide\");\n  });\n  (0, _jquery.default)(\"#theme-settings-button\").click(function () {\n    var form = (0, _jquery.default)(\"#theme-settings-modal form\");\n    var data; // Ignore invalid JSON data\n\n    try {\n      data = JSON.parse(theme_settings_editor.getValue());\n    } catch (e) {\n      data = {};\n    }\n\n    _jquery.default.each(data, function (key, value) {\n      var ctrl = form.find(\"[name='\".concat(key, \"']\"));\n\n      switch (ctrl.prop(\"type\")) {\n        case \"radio\":\n        case \"checkbox\":\n          ctrl.each(function () {\n            if ((0, _jquery.default)(this).attr(\"value\") == value) {\n              (0, _jquery.default)(this).attr(\"checked\", value);\n            }\n          });\n          break;\n\n        default:\n          ctrl.val(value);\n      }\n    });\n\n    (0, _jquery.default)(\"#theme-settings-modal\").modal();\n  });\n  insertTimezones((0, _jquery.default)(\"#start-timezone\"));\n  insertTimezones((0, _jquery.default)(\"#end-timezone\"));\n  insertTimezones((0, _jquery.default)(\"#freeze-timezone\"));\n  (0, _jquery.default)(\".config-section > form:not(.form-upload)\").submit(updateConfigs);\n  (0, _jquery.default)(\"#logo-upload\").submit(uploadLogo);\n  (0, _jquery.default)(\"#remove-logo\").click(removeLogo);\n  (0, _jquery.default)(\"#export-button\").click(exportConfig);\n  (0, _jquery.default)(\"#import-button\").click(importConfig);\n  (0, _jquery.default)(\"#config-color-update\").click(function () {\n    var hex_code = (0, _jquery.default)(\"#config-color-picker\").val();\n    var user_css = theme_header_editor.getValue();\n    var new_css;\n\n    if (user_css.length) {\n      var css_vars = \"theme-color: \".concat(hex_code, \";\");\n      new_css = user_css.replace(/theme-color: (.*);/, css_vars);\n    } else {\n      new_css = \"<style id=\\\"theme-color\\\">\\n\" + \":root {--theme-color: \".concat(hex_code, \";}\\n\") + \".navbar{background-color: var(--theme-color) !important;}\\n\" + \".jumbotron{background-color: var(--theme-color) !important;}\\n\" + \"</style>\\n\";\n    }\n\n    theme_header_editor.getDoc().setValue(new_css);\n  });\n  (0, _jquery.default)(\".start-date\").change(function () {\n    loadDateValues(\"start\");\n  });\n  (0, _jquery.default)(\".end-date\").change(function () {\n    loadDateValues(\"end\");\n  });\n  (0, _jquery.default)(\".freeze-date\").change(function () {\n    loadDateValues(\"freeze\");\n  });\n  var start = (0, _jquery.default)(\"#start\").val();\n  var end = (0, _jquery.default)(\"#end\").val();\n  var freeze = (0, _jquery.default)(\"#freeze\").val();\n\n  if (start) {\n    loadTimestamp(\"start\", start);\n  }\n\n  if (end) {\n    loadTimestamp(\"end\", end);\n  }\n\n  if (freeze) {\n    loadTimestamp(\"freeze\", freeze);\n  } // Toggle username and password based on stored value\n\n\n  (0, _jquery.default)(\"#mail_useauth\").change(function () {\n    (0, _jquery.default)(\"#mail_username_password\").toggle(this.checked);\n  }).change(); // Insert FieldList element for users\n\n  var fieldList = _vueEsm.default.extend(_FieldList.default);\n\n  var userVueContainer = document.createElement(\"div\");\n  document.querySelector(\"#user-field-list\").appendChild(userVueContainer);\n  new fieldList({\n    propsData: {\n      type: \"user\"\n    }\n  }).$mount(userVueContainer); // Insert FieldList element for teams\n\n  var teamVueContainer = document.createElement(\"div\");\n  document.querySelector(\"#team-field-list\").appendChild(teamVueContainer);\n  new fieldList({\n    propsData: {\n      type: \"team\"\n    }\n  }).$mount(teamVueContainer);\n});\n\n//# sourceURL=webpack:///./CTFd/themes/admin/assets/js/pages/configs.js?");
 
 /***/ })
 
diff --git a/CTFd/themes/admin/templates/configs/fields.html b/CTFd/themes/admin/templates/configs/fields.html
index e9382494..bc687cbc 100644
--- a/CTFd/themes/admin/templates/configs/fields.html
+++ b/CTFd/themes/admin/templates/configs/fields.html
@@ -12,6 +12,11 @@
 					Users
 				</a>
 			</li>
+			<li class="nav-item">
+				<a class="nav-link" href="#team-fields" role="tab" data-toggle="tab">
+					Teams
+				</a>
+			</li>
 		</ul>
 
 		<div class="tab-content">
@@ -23,6 +28,14 @@
 				<div id="user-field-list" class="pt-3">
 				</div>
 			</div>
+			<div role="tabpanel" class="tab-pane" id="team-fields">
+				<div class="col-md-12 py-3">
+					<small>Custom team fields are shown during team creation. Team captains can optionally edit these fields in the team profile.</small>
+				</div>
+
+				<div id="team-field-list" class="pt-3">
+				</div>
+			</div>
 		</div>
 	</form>
 </div>
\ No newline at end of file