diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue
index d191fc8..ff7597f 100644
--- a/src/components/modals/coresettings/EditCoreSettings.vue
+++ b/src/components/modals/coresettings/EditCoreSettings.vue
@@ -38,6 +38,36 @@
                     class="col-6"
                   />
                 </q-card-section>
+                <q-card-section class="row">
+                  <div class="col-4">Default server policy:</div>
+                  <div class="col-2"></div>
+                  <q-select
+                    clearable
+                    map-options
+                    emit-value
+                    outlined
+                    dense
+                    options-dense
+                    v-model="settings.server_policy"
+                    :options="policies"
+                    class="col-6"
+                  />
+                </q-card-section>
+                <q-card-section class="row">
+                  <div class="col-4">Default workstation policy:</div>
+                  <div class="col-2"></div>
+                  <q-select
+                    clearable
+                    map-options
+                    emit-value
+                    outlined
+                    dense
+                    options-dense
+                    v-model="settings.workstation_policy"
+                    :options="policies"
+                    class="col-6"
+                  />
+                </q-card-section>
                 <q-card-section class="row">
                   <div class="col-4">Reset Patch Policy on Agents:</div>
                   <div class="col-2"></div>
@@ -206,6 +236,7 @@
 <script>
 import axios from "axios";
 import mixins from "@/mixins/mixins";
+import { mapState } from "vuex";
 import ResetPatchPolicy from "@/components/modals/coresettings/ResetPatchPolicy";
 
 export default {
@@ -241,6 +272,11 @@ export default {
         this.ready = true;
       });
     },
+    getPolicies() {
+      this.$store.dispatch("automation/loadPolicies").catch(e => {
+        this.notifyError(e.response.data);
+      });
+    },
     toggleAddEmail() {
       this.$q
         .dialog({
@@ -267,6 +303,7 @@ export default {
     },
     editSettings() {
       this.$q.loading.show();
+      console.log(this.settings);
       axios
         .patch("/core/editsettings/", this.settings)
         .then(r => {
@@ -295,8 +332,14 @@ export default {
         });
     },
   },
+  computed: {
+    ...mapState({
+      policies: state => state.automation.policies.map(policy => ({ label: policy.name, value: policy.id })),
+    }),
+  },
   created() {
     this.getCoreSettings();
+    this.getPolicies();
   },
 };
 </script>
\ No newline at end of file