diff --git a/frontend/ee b/frontend/ee
index df736e11aa..9aa23fc0aa 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit df736e11aa0246e704ec7433cc2025d10fdad0f3
+Subproject commit 9aa23fc0aa78a84dd13dd7308fa3de63c9c553ff
diff --git a/server/ee b/server/ee
index e62dbb822d..9099be6814 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit e62dbb822ddbe86e35f2405edbf830711632cf7b
+Subproject commit 9099be6814072b4e37713af6f374868b027c95f8
diff --git a/server/src/modules/instance-settings/constants/index.ts b/server/src/modules/instance-settings/constants/index.ts
index 49a363b156..50b12a8337 100644
--- a/server/src/modules/instance-settings/constants/index.ts
+++ b/server/src/modules/instance-settings/constants/index.ts
@@ -57,5 +57,6 @@ export function getDefaultInstanceSettings() {
     [INSTANCE_SYSTEM_SETTINGS.SMTP_PASSWORD]: process.env.SMTP_PASSWORD,
     [INSTANCE_SYSTEM_SETTINGS.SMTP_ENABLED]: process.env.SMTP_DISABLED === 'true' ? 'false' : 'true',
     [INSTANCE_SYSTEM_SETTINGS.SMTP_ENV_CONFIGURED]: 'true',
+    [INSTANCE_SYSTEM_SETTINGS.SMTP_FROM_EMAIL]: process.env.DEFAULT_FROM_EMAIL
   };
 }
diff --git a/server/src/modules/smtp/interfaces/IUtilService.ts b/server/src/modules/smtp/interfaces/IUtilService.ts
new file mode 100644
index 0000000000..f1b80c63b1
--- /dev/null
+++ b/server/src/modules/smtp/interfaces/IUtilService.ts
@@ -0,0 +1,7 @@
+export interface ISMTPUtilService {
+  getSmtpEnv(
+    key?: string | string[],
+    getAllData?: boolean,
+    type?: any
+  ): Promise<any>;
+}
\ No newline at end of file
diff --git a/server/src/modules/smtp/module.ts b/server/src/modules/smtp/module.ts
index ae5ede709b..16f5ed9448 100644
--- a/server/src/modules/smtp/module.ts
+++ b/server/src/modules/smtp/module.ts
@@ -9,11 +9,12 @@ export class SMTPModule {
     const importPath = await getImportPath(configs?.IS_GET_CONTEXT);
     const { SMTPService } = await import(`${importPath}/smtp/service`);
     const { SmtpController } = await import(`${importPath}/smtp/controller`);
+    const { SMTPUtilService } = await import(`${importPath}/smtp/util.service`)
     return {
       module: SMTPModule,
       imports: [await InstanceSettingsModule.register(configs)],
       controllers: [SmtpController],
-      providers: [SMTPService, FeatureAbilityFactory],
+      providers: [SMTPService, FeatureAbilityFactory, SMTPUtilService],
     };
   }
 }
diff --git a/server/src/modules/smtp/util.service.ts b/server/src/modules/smtp/util.service.ts
new file mode 100644
index 0000000000..ca180cd17c
--- /dev/null
+++ b/server/src/modules/smtp/util.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from "@nestjs/common";
+import { ISMTPUtilService } from "./interfaces/IUtilService";
+
+@Injectable()
+export class SMTPUtilService implements ISMTPUtilService {
+  getSmtpEnv(key?: string | string[], getAllData = false, type?: any): Promise<any> {
+    throw new Error('Method not implemented.');
+  }
+}
\ No newline at end of file