diff --git a/.env b/.env
index 57f1728..4190848 100644
--- a/.env
+++ b/.env
@@ -47,6 +47,7 @@ TWITTER_ID=
 TWITTER_SECRET=
 
 EMAIL_BYPASS_TO=mwitnessing@gmail.com
+EMAIL_SENDER='"Специално Свидетелстване София " <mwitnessing@gmail.com>'
 # EMAIL_SERVER=smtp://8ec69527ff2104:c7bc05f171c96c@smtp.mailtrap.io:2525
 EMAIL_FROM=noreply@mwitnessing.com
 
diff --git a/src/helpers/email.js b/src/helpers/email.js
index 4288e5b..64efd24 100644
--- a/src/helpers/email.js
+++ b/src/helpers/email.js
@@ -119,12 +119,12 @@ function normalizeEmailAddresses(to) {
 
 
 exports.SendEmail = async function (to, subject, text, html, attachments = []) {
-  let sender = '"Специално Свидетелстване София - тест" <demo@mwitnessing.com>';
-  const emailAddresses = normalizeEmailAddresses(to)
+  let sender = process.env.EMAIL_SENDER || '"Специално Свидетелстване София " <sofia@mwitnessing.com>';
+  let emailAddresses = normalizeEmailAddresses(to)
 
   const bypassEmailReccipients = process.env.EMAIL_BYPASS_TO || null;
   if (bypassEmailReccipients !== null && bypassEmailReccipients.length > 0) {
-    emailAddresses = "[" + bypassEmailReccipients + "]";
+    emailAddresses = bypassEmailReccipients;
     console.log("Emails bypassed. All mails sent to: " + emailAddresses);
   }