diff --git a/src/app/service/admin.service.ts b/src/app/service/admin.service.ts
index 4e1294b..aa113ac 100644
--- a/src/app/service/admin.service.ts
+++ b/src/app/service/admin.service.ts
@@ -128,8 +128,8 @@ export class AdminService {
 
             try {
                 await MailService.sendMail({
-                    from: from,
                     subject: subject,
+                    from: from,
                     to: data.emailTo,
                     html: emailContent,
                 });
@@ -286,8 +286,8 @@ export class AdminService {
 
             try {
                 await MailService.sendMail({
-                    from: from,
                     subject: `${subject} nr. ${data.report[1]} - drd. ${data.studentName}`,
+                    from: from,
                     to: data.studentEmail,
                     html: emailContent,
                     attachments: [{
diff --git a/src/app/service/auth.service.ts b/src/app/service/auth.service.ts
index fb309f1..93d01ed 100644
--- a/src/app/service/auth.service.ts
+++ b/src/app/service/auth.service.ts
@@ -96,6 +96,7 @@ export class AuthService {
 
         try {
             await MailService.sendMail({
+                subject: SignupMessage.subject,
                 from: EmailDefaults.FROM,
                 to: email,
                 html: SignupMessage.getHtml(email),
@@ -137,6 +138,7 @@ export class AuthService {
 
         try {
             await MailService.sendMail({
+                subject: LoginMessage.subject,
                 from: EmailDefaults.FROM,
                 to: loginEmail,
                 html: LoginMessage.getHtml(generatedCode),
@@ -225,6 +227,7 @@ export class AuthService {
 
         try {
             await MailService.sendMail({
+                subject: AdminLoginMessage.subject,
                 from: EmailDefaults.FROM,
                 to: email,
                 html: AdminLoginMessage.getHtml(generatedCode),
diff --git a/src/app/services/email.service.ts b/src/app/services/email.service.ts
index e5b29ef..9892712 100644
--- a/src/app/services/email.service.ts
+++ b/src/app/services/email.service.ts
@@ -29,24 +29,30 @@ export class MailService {
 }
 
 export class LoginMessage {
+    static subject = '[Login] Școala Doctorală FII';
+
     static getHtml(code: string) {
         return `Hello! In order to log in paste this code into the app <b>${code}</b> .`;
     }
 }
 
 export class SignupMessage {
+    static subject = '[Signup] Școala Doctorală FII';
+
     static getHtml(firstname: string) {
         return `Hello: ${firstname}! Welcome!`;
     }
 }
 
 export class AdminLoginMessage {
+    static subject = '[Login] Școala Doctorală FII';
+
     static getHtml(code: string) {
         return `Hello! In order to log in paste this code into the app <b>${code}</b> .`;
     }
 }
 
 export enum EmailDefaults {
-    FROM = 'Scoala Doctorala FII <adriana.bejinariu@info.uaic.ro>',
+    FROM = 'Școala Doctorală FII <adriana.bejinariu@info.uaic.ro>',
     APP_NAME = 'Școala Doctorală de Informatică',
 }
\ No newline at end of file