2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index df7d9b56aed..a07c57c42cb 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -30,6 +30,10 @@ export default {
       required: false,
       default: '',
     },
+    customEmailEnabled: {
+      type: Boolean,
+      required: false,
+    },
     selectedTemplate: {
       type: String,
       required: false,
@@ -140,6 +144,7 @@ export default {
       :is-enabled="isEnabled"
       :incoming-email="incomingEmail"
       :custom-email="updatedCustomEmail"
+      :custom-email-enabled="customEmailEnabled"
       :initial-selected-template="selectedTemplate"
       :initial-outgoing-name="outgoingName"
       :initial-project-key="projectKey"
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 5d120fd0b3f..2896cb491b5 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -31,6 +31,10 @@ export default {
       required: false,
       default: '',
     },
+    customEmailEnabled: {
+      type: Boolean,
+      required: false,
+    },
     initialSelectedTemplate: {
       type: String,
       required: false,
@@ -69,7 +73,7 @@ export default {
       return [''].concat(this.templates);
     },
     hasProjectKeySupport() {
-      return Boolean(this.glFeatures.serviceDeskCustomAddress);
+      return Boolean(this.customEmailEnabled);
     },
     email() {
       return this.customEmail || this.incomingEmail;