diff --git a/src/common/email.py b/src/common/email.py
index 39f5a7b448b4d1052cc5ef063da20e5fa04be324..b7fed6a88488d3f8956386b172e9bf4b684e322b 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -1,9 +1,10 @@
+import os
 from django.core.mail import send_mail
 import codecs
 import sys
 
-sender_email = 'noreply@ujonc.kszk.bme.hu'
-link = 'https://ujonc.kszk.bme.hu/homework'
+SENDER_EMAIL = os.getenv('SENDER_MAIL', 'kepzes@kszk.bme.hu')
+HOMEWORK_LINK = os.getenv('HOMEWORK_LINK', 'https://ujonc.kszk.bme.hu/homework')
 
 
 def get_full_name(user):
@@ -16,19 +17,19 @@ def read_email(name):
     return data
 
 
-def send_out_mail(subject, message, sender_email, receiver_email):
+def send_out_mail(subject, message, SENDER_EMAIL, receiver_email):
     if 'runserver' in sys.argv:
         # It is in development
-        print("Email sent from: " + str(sender_email) + " to: " + str(receiver_email))
+        print("Email sent from: " + str(SENDER_EMAIL) + " to: " + str(receiver_email))
     else:
-        send_mail(subject, message, sender_email, [receiver_email, ])
+        send_mail(subject, message, SENDER_EMAIL, [receiver_email, ])
 
 
 def registration(user):
     subject = "KszkĂŠpzĂŠs regisztrĂĄciĂł"
     message = read_email('registration.txt')
     message = str.format(message % {'name': get_full_name(user)})
-    send_out_mail(subject, message, sender_email, [user.email, ])
+    send_out_mail(subject, message, SENDER_EMAIL, [user.email, ])
     pass
 
 
@@ -36,7 +37,7 @@ def admitted(user):
     subject = "JelentkezĂŠs eredmĂŠnye"
     message = read_email('admitted.txt')
     message = str.format(message % {'name': get_full_name(user)})
-    send_out_mail(subject, message, sender_email, [user.email, ])
+    send_out_mail(subject, message, SENDER_EMAIL, [user.email, ])
     pass
 
 
@@ -44,7 +45,7 @@ def denied(user):
     subject = "JelentkezĂŠs eredmĂŠnye"
     message = read_email('denied.txt')
     message = str.format(message % {'name': get_full_name(user)})
-    send_out_mail(subject, message, sender_email, [user.email, ])
+    send_out_mail(subject, message, SENDER_EMAIL, [user.email, ])
     pass
 
 
@@ -53,8 +54,8 @@ def new_homework(user, deadline):
     subject = "Új házifeladat"
     message = read_email('new_homework.txt')
     message = str.format(
-        message % {'name': get_full_name(user), 'link': link, 'deadline': deadline})
-    send_out_mail(subject, message, sender_email, [user.email, ])
+        message % {'name': get_full_name(user), 'link': HOMEWORK_LINK, 'deadline': deadline})
+    send_out_mail(subject, message, SENDER_EMAIL, [user.email, ])
     pass
 
 
@@ -66,8 +67,8 @@ def homework_corrected(user, title, accepted):
         status = 'HibĂĄs'
     message = read_email('homework_corrected.txt')
     message = str.format(message % {'name': get_full_name(user),
-                                    'link': link,
+                                    'link': HOMEWORK_LINK,
                                     'status': status,
                                     'title': title})
-    send_out_mail(subject, message, sender_email, [user.email, ])
+    send_out_mail(subject, message, SENDER_EMAIL, [user.email, ])
     pass
diff --git a/src/kszkepzes/settings/production.py b/src/kszkepzes/settings/production.py
index f6d364955eb58dbcdd773123c282c597ee0ccc5a..13f7a4d36d9412da82aa607c306807a945cf7715 100644
--- a/src/kszkepzes/settings/production.py
+++ b/src/kszkepzes/settings/production.py
@@ -26,4 +26,7 @@ REST_FRAMEWORK = {
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'mail.sch.bme.hu'
-EMAIL_PORT = 25
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True
+EMAIL_HOST_USER = os.getenv('SMTP_USER')
+EMAIL_HOST_PASSWORD = os.getenv('SMTP_PASSWORD')