diff --git a/src/account/auth_pipeline.py b/src/account/auth_pipeline.py
index 16eb573a1b7685e0b52a86eaa46470a9ff604ce7..571b46db2034efde46049b5aa74b7faa76534b09 100644
--- a/src/account/auth_pipeline.py
+++ b/src/account/auth_pipeline.py
@@ -1,14 +1,14 @@
 from django.core import exceptions
-from common.email import registration_email
+from common.email import registration
 
 from . import models
 
 
 def create_profile(backend, user, response, *args, **kwargs):
     if backend.name == 'authsch':
-        if user.email is not None:
-            registration_email(user.email)
         try:
             user.profile
         except exceptions.ObjectDoesNotExist:
             models.Profile.objects.create(user=user)
+            if user.email is not None:
+                registration(user.email)
diff --git a/src/common/email.py b/src/common/email.py
index 6e455ad7a3131cc3cd9b4f24419aafa024960575..67ca7d6939d97113b1cfbe13790c7856dd520bbe 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -1,6 +1,32 @@
 from django.core.mail import send_mail
 
 
-def registration_email(email):
-    send_mail('TESZT', 'Udvozlunk a kszkepzesen, ne felejtsd el kitolteni a profilod.',
-              'noreply@devteam.sch.bme.hu', [email, ])
\ No newline at end of file
+def registration(email):
+    subject = "REGISTRATION TEST"
+    message = "Üdvözlünk a kszképzésen!"
+    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+
+def admitted(email):
+    subject = "ADMITTED TEST"
+    message = "GratulĂĄlunk, te vagy a kivĂĄlasztott!!"
+    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+
+def denied(email):
+    subject = "DENIED TEST"
+    message = "Sajnos idĂŠn nem nyertĂŠl felvĂŠtelt, prĂłbĂĄld meg legkĂśzelebb"
+    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+
+def new_homework(email):
+    subject = "NEW HOMEWORK TEST"
+    message = "Szia!\nEgy Ăşj hĂĄzi lett kiadva, ha tĂ­z percen belĂźl megoldod akkor fasza gyerek vagy," \
+              " ha nem ĂŠleted vĂŠgĂŠig bĂĄnnifogod..."
+    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+
+def homework_corrected(email):
+    subject = "HOMEWORK CORRECTED TEST"
+    message = "NagyszerĹą mentoraink kijavĂ­tottĂĄk hĂĄzifeladatod, vajon most kaptĂĄl meglepit?!"
+    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
diff --git a/src/kszkepzes/settings/production.py b/src/kszkepzes/settings/production.py
index 4d6661055ac6e67039f2a2ec32cb76873d5bfcb8..24575d5119056ab8467b6fdd4263b206fe114d7c 100644
--- a/src/kszkepzes/settings/production.py
+++ b/src/kszkepzes/settings/production.py
@@ -27,14 +27,6 @@ REST_FRAMEWORK = {
 
 STATIC_ROOT = os.path.join(BASE_DIR, 'static_collected')
 
-
-# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# EMAIL_HOST = 'mail.sch.bme.hu'
-# EMAIL_USE_TLS = True
-# EMAIL_PORT = 587
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'smtp.gmail.com'
-EMAIL_USE_TLS = True
-EMAIL_PORT = 587
-EMAIL_HOST_USER = 'bmate711kamu@gmail.com'
-EMAIL_HOST_PASSWORD = '1IronxDog'
+EMAIL_HOST = 'mail.sch.bme.hu'
+EMAIL_PORT = 25