diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a42b1e1..6069279 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -28,6 +28,7 @@ if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWSEC_CONFIG"/owsec.properties ]]; t
   MAILER_HOSTNAME=${MAILER_HOSTNAME:-"smtp.gmail.com"} \
   MAILER_USERNAME=${MAILER_USERNAME:-"************************"} \
   MAILER_PASSWORD=${MAILER_PASSWORD:-"************************"} \
+  MAILER_SENDER=${MAILER_SENDER:-"OpenWIFI"} \
   MAILER_PORT=${MAILER_PORT:-"587"} \
   KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
   KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
diff --git a/helm/values.yaml b/helm/values.yaml
index 09c8fab..d18408e 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -133,6 +133,7 @@ configProperties:
   authentication.service.type: internal
   # Mailer
   mailer.hostname: smtp.gmail.com
+  mailer.sender: OpenWIFI
   mailer.loginmethod: login
   mailer.port: 587
   mailer.templates: $OWSEC_ROOT/templates
diff --git a/owsec.properties b/owsec.properties
index 45b00ff..8e666e0 100644
--- a/owsec.properties
+++ b/owsec.properties
@@ -46,6 +46,7 @@ openwifi.service.key.password = mypassword
 mailer.hostname = smtp.gmail.com
 mailer.username = ************************
 mailer.password = ************************
+mailer.sender = OpenWIFI
 mailer.loginmethod = login
 mailer.port = 587
 mailer.templates = $OWSEC_ROOT/templates
diff --git a/owsec.properties.tmpl b/owsec.properties.tmpl
index e0cb919..5d3258f 100644
--- a/owsec.properties.tmpl
+++ b/owsec.properties.tmpl
@@ -46,6 +46,7 @@ openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
 mailer.hostname = ${MAILER_HOSTNAME}
 mailer.username = ${MAILER_USERNAME}
 mailer.password = ${MAILER_PASSWORD}
+mailer.sender = ${MAILER_SENDER}
 mailer.loginmethod = login
 mailer.port = ${MAILER_PORT}
 mailer.templates = $UCENTRALSEC_ROOT/templates
diff --git a/src/SMTPMailerService.cpp b/src/SMTPMailerService.cpp
index 746f007..0292724 100644
--- a/src/SMTPMailerService.cpp
+++ b/src/SMTPMailerService.cpp
@@ -165,4 +165,4 @@ namespace OpenWifi {
         return false;
     }
 
-}
\ No newline at end of file
+}