diff --git a/src/configuration/config.service.ts b/src/configuration/config.service.ts
index aca5e805c94a0ea9d8d0d1d1d05fb22eb665d566..d32d55355875b4d957672e068c21ff10223a3c41 100644
--- a/src/configuration/config.service.ts
+++ b/src/configuration/config.service.ts
@@ -11,13 +11,8 @@ export class ConfigService {
     this._config.smtpConfig.port = process.env.SMTP_PORT;
 
     if (process.env.SMTP_USER && process.env.SMTP_PASSWORD) {
-      this._config.smtpConfig = {
-        ...this._config.smtpConfig,
-        auth: {
-          user: process.env.SMTP_USER,
-          pass: process.env.SMTP_PASSWORD,
-        },
-      };
+      this._config.smtpConfig.auth.user = process.env.SMTP_USER;
+      this._config.smtpConfig.auth.pass = process.env.SMTP_PASSWORD;
     }
     this._config.mailSubjectPrefix = process.env.MAIL_SUBJECT_PREFIX;
     this._config.userSupportMailbox = process.env.USER_SUPPORT_MAILBOX;
@@ -30,6 +25,14 @@ export class ConfigService {
   }
 
   get config() {
+    const filteredConf = { ...this._config };
+
+    if (
+      !this._config.smtpConfig.auth.user &&
+      !this._config.smtpConfig.auth.pass
+    ) {
+      delete this._config.smtpConfig.auth;
+    }
     return this._config;
   }
 }
diff --git a/src/configuration/config.ts b/src/configuration/config.ts
index 756ec28a60a2ad17c43889c6eb41e6a25705fa77..661a9234b6f2250d7d9ad7664e79898ea68af2a5 100644
--- a/src/configuration/config.ts
+++ b/src/configuration/config.ts
@@ -7,6 +7,10 @@ export const config = {
       // do not fail on invalid certs
       rejectUnauthorized: false,
     },
+    auth: {
+      user: null,
+      pass: null,
+    },
   },
   userSupportMailbox: '',
   imageHost: '',