diff --git a/api/server.js b/api/server.js
index 24d8dc6..a15b5a4 100644
--- a/api/server.js
+++ b/api/server.js
@@ -4,7 +4,7 @@ const bodyParser = require('body-parser');
 const cors = require('cors');
 const helmet = require('helmet');
 
-const smtpStatus = require('../helpers/smtpStatus');
+const logSmtpStatus  = require('../helpers/logSmtpStatus');
 
 const accountsRoute = require('./routes/accountRoute');
 const meetingsRoute = require('./routes/meetingRoute');
@@ -36,13 +36,14 @@ server.use('/api/possible-dates', possibleDatesRoute);
 server.use('/api/availability', availabilityRoute);
 server.use('/api/auth', authRoute);
 
-const smtpMessage = smtpStatus();
+// Uncomment to log SMTP status. If config is correct,
+// the console will output:'SMTP is correctly configured.'
+// logSmtpStatus();
 
 server.get('/', (req, res) => {
 	res.json({
 		message: `Meeting Planner Backend API :)`,
 		documentation: `Check out: https://git.armada.digital/meeting-planner/backend`,
-		SMTP: `${smtpMessage}`,
 	});
 });
 
diff --git a/helpers/logSmtpStatus.js b/helpers/logSmtpStatus.js
new file mode 100644
index 0000000..18ba2a9
--- /dev/null
+++ b/helpers/logSmtpStatus.js
@@ -0,0 +1,14 @@
+const transporter = require('./smtpConfig');
+
+function logSmtpStatus() {
+	transporter.verify(function (error, success) {
+		if (error) {
+			console.log('SMTP is not working, check your configuration.');
+			return ``;
+		} else {
+			console.log('SMTP is correctly configured.');
+		}
+	});
+}
+
+module.exports = logSmtpStatus;
diff --git a/helpers/smtpTransporter.js b/helpers/smtpConfig.js
similarity index 100%
rename from helpers/smtpTransporter.js
rename to helpers/smtpConfig.js
diff --git a/helpers/smtpStatus.js b/helpers/smtpStatus.js
deleted file mode 100644
index 722ccea..0000000
--- a/helpers/smtpStatus.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const smtpTransporter = require('./smtpTransporter');
-
-function smtpStatus() {
-	smtpTransporter.verify(function (error, success) {
-		if (error) {
-            console.log(error);
-            return `SMTP is not working, check your configuration.`
-		} else {
-            console.log('Server is ready to take our messages');
-            return `SMTP is correctly configured.`
-		}
-	});
-}
-
-module.exports = smtpStatus;