diff --git a/docker-compose.yml b/docker-compose.yml
index 72ed0746d..6c3be8c67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,6 @@ services:
       - DOMAIN=localhost
       - SITE_NAME=Drama
       - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
-      - MAILGUN_KEY=3435tdfsdudebussylmaoxxt43
-      - MAILGUN_DOMAIN=rdrama.net
       - FORCE_HTTPS=0
       - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43
       - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43
@@ -41,6 +39,8 @@ services:
       - CARD_VIEW=1
       - DISABLE_DOWNVOTES=0
       - DUES=0
+      - MAIL_USERNAME=blahblahblah@gmail.com
+      - MAIL_PASSWORD=3435tdfsdudebussylmaoxxt43
     links:
       - "redis"
       - "postgres"
diff --git a/env b/env
index 0a937e482..3409332b5 100644
--- a/env
+++ b/env
@@ -3,8 +3,6 @@ export MASTER_KEY="-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA="
 export DOMAIN="localhost"
 export SITE_NAME="Drama"
 export GIPHY_KEY="3435tdfsdudebussylmaoxxt43"
-export MAILGUN_KEY="3435tdfsdudebussylmaoxxt43"
-export MAILGUN_DOMAIN="rdrama.net"
 export FORCE_HTTPS="0"
 export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43"
 export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43"
@@ -29,4 +27,6 @@ export CARD_VIEW="1"
 export DISABLE_DOWNVOTES="0"
 export DUES="0"
 export DEFAULT_THEME="dark"
-export DEFAULT_COLOR="ff66ac" # YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58
\ No newline at end of file
+export DEFAULT_COLOR="ff66ac" # YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58
+export MAIL_USERNAME="blahblahblah@gmail.com"
+export MAIL_PASSWORD="3435tdfsdudebussylmaoxxt43"
\ No newline at end of file
diff --git a/files/mail/__init__.py b/files/mail/__init__.py
index dafbc05a7..492c27004 100644
--- a/files/mail/__init__.py
+++ b/files/mail/__init__.py
@@ -16,7 +16,7 @@ name = environ.get("SITE_NAME").strip()
 
 def send_mail(to_address, subject, html):
 
-	msg = Message(html=html, subject=subject, sender="rdrama@rdrama.net", recipients=[to_address])
+	msg = Message(html=html, subject=subject, sender=f"{name}@{site}", recipients=[to_address])
 	mail.send(msg)