diff --git a/app.ini.template b/app.ini.template
index fda80fb..863090e 100644
--- a/app.ini.template
+++ b/app.ini.template
@@ -29,9 +29,10 @@ LANDING_PAGE = explore
 [mailer]
 ENABLED = true
 HOST = ##MAIL_SERVER:##MAIL_PORT
-USER =
-PASSWD =
+USER = ##MAIL_SMTP_USERNAME
+PASSWD = ##MAIL_SMTP_PASSWORD
 FROM = ##MAIL_FROM
+SKIP_VERIFY = true
 
 [admin]
 
diff --git a/start.sh b/start.sh
index 407a685..a0bb0a4 100755
--- a/start.sh
+++ b/start.sh
@@ -59,7 +59,9 @@ sed -e "s/##DOMAIN/${APP_DOMAIN}/g" \
     -e "s/##MYSQL_DATABASE/${MYSQL_DATABASE}/g" \
     -e "s/##MAIL_SERVER/${MAIL_SMTP_SERVER}/g" \
     -e "s/##MAIL_PORT/${MAIL_SMTP_PORT}/g" \
-    -e "s/##MAIL_FROM/${MAIL_SMTP_USERNAME}@${MAIL_DOMAIN}/g" \
+    -e "s/##MAIL_FROM/${MAIL_FROM}/g" \
+    -e "s/##MAIL_SMTP_USERNAME/${MAIL_SMTP_USERNAME}/g" \
+    -e "s/##MAIL_SMTP_PASSWORD/${MAIL_SMTP_PASSWORD}/g" \
     -e "s/##SECRET_KEY/$(pwgen -1 -s)/g" \
     /home/git/app.ini.template > "/run/gogs/app.ini"