diff --git a/src/common/email.py b/src/common/email.py
index 9fbf335599ec9e01becf79686e977b3de99e7a33..39f5a7b448b4d1052cc5ef063da20e5fa04be324 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -6,6 +6,10 @@ sender_email = 'noreply@ujonc.kszk.bme.hu'
 link = 'https://ujonc.kszk.bme.hu/homework'
 
 
+def get_full_name(user):
+    return user.last_name + " " + user.first_name
+
+
 def read_email(name):
     with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile:
         data = myfile.read()
@@ -23,7 +27,7 @@ def send_out_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': user.get_full_name()})
+    message = str.format(message % {'name': get_full_name(user)})
     send_out_mail(subject, message, sender_email, [user.email, ])
     pass
 
@@ -31,7 +35,7 @@ def registration(user):
 def admitted(user):
     subject = "JelentkezĂŠs eredmĂŠnye"
     message = read_email('admitted.txt')
-    message = str.format(message % {'name': user.get_full_name()})
+    message = str.format(message % {'name': get_full_name(user)})
     send_out_mail(subject, message, sender_email, [user.email, ])
     pass
 
@@ -39,7 +43,7 @@ def admitted(user):
 def denied(user):
     subject = "JelentkezĂŠs eredmĂŠnye"
     message = read_email('denied.txt')
-    message = str.format(message % {'name': user.get_full_name()})
+    message = str.format(message % {'name': get_full_name(user)})
     send_out_mail(subject, message, sender_email, [user.email, ])
     pass
 
@@ -49,7 +53,7 @@ def new_homework(user, deadline):
     subject = "Új házifeladat"
     message = read_email('new_homework.txt')
     message = str.format(
-        message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
+        message % {'name': get_full_name(user), 'link': link, 'deadline': deadline})
     send_out_mail(subject, message, sender_email, [user.email, ])
     pass
 
@@ -61,7 +65,9 @@ def homework_corrected(user, title, accepted):
     else:
         status = 'HibĂĄs'
     message = read_email('homework_corrected.txt')
-    message = str.format(message % {'name': user.get_full_name(
-    ), 'link': link, 'status': status, 'title': title})
+    message = str.format(message % {'name': get_full_name(user),
+                                    'link': link,
+                                    'status': status,
+                                    'title': title})
     send_out_mail(subject, message, sender_email, [user.email, ])
     pass