diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html
index d0d1ec0c..6ee00c98 100644
--- a/contact-us/contact-us.component.html
+++ b/contact-us/contact-us.component.html
@@ -44,9 +44,16 @@
         <div class="uk-width-1-1">
             <h5 class="uk-text-bold uk-margin-remove-bottom">Stakeholder Name<span class="uk-text-danger uk-text-bold">*</span></h5>
         </div>
-        <input class="uk-input uk-width-1-1" type="text" placeholder="Your funder name" formControlName="funder"
+        <input class="uk-input uk-width-1-1" type="text" placeholder="Your funder name" formControlName="stakeholder"
                [class.uk-form-danger]="contactForm.get('stakeholder').invalid && contactForm.get('stakeholder').touched">
     </div>
+    <div *ngIf="contactForm.get('subject')" class="uk-width-1-1@s uk-margin-top">
+        <div class="uk-width-1-1">
+            <h5 class="uk-text-bold uk-margin-remove-bottom">Subject<span class="uk-text-danger uk-text-bold">*</span></h5>
+        </div>
+        <input class="uk-input uk-width-1-1" type="text" placeholder="Your subject" formControlName="subject"
+               [class.uk-form-danger]="contactForm.get('subject').invalid && contactForm.get('subject').touched">
+    </div>
     <div *ngIf="contactForm.get('message')" class="uk-width-1-1 uk-margin-top">
         <h5 class="uk-text-bold uk-margin-remove-bottom">
             Message <span class="uk-text-danger uk-text-bold">*</span>
diff --git a/utils/email/composer.ts b/utils/email/composer.ts
index 28e4aa04..8ae0ed73 100644
--- a/utils/email/composer.ts
+++ b/utils/email/composer.ts
@@ -51,8 +51,8 @@ export class Composer {
 
   public static composeEmailForNewCommunity(contactForm: any, admins: any): Email {
     let email: Email = new Email();
-
-    email.subject = "RCD: Request for new community";
+  
+    email.subject = "OpenAIRE Connect | " + contactForm.subject;
     email.body = "<div style='font-size:" + this.noteBodySize + "'>"
                + "<span><b>Name</b>: " + contactForm.name + "</span><br>"
                + "<span><b>Surname</b>: " + contactForm.surname + "</span><br>"
@@ -65,6 +65,22 @@ export class Composer {
     return email;
   }
   
+  public static composeEmailForNewStakeholder(contactForm: any, admins: any): Email {
+    let email: Email = new Email();
+    
+    email.subject = "OpenAIRE Monitor | " + contactForm.subject;
+    email.body = "<div style='font-size:" + this.noteBodySize + "'>"
+      + "<span><b>Name</b>: " + contactForm.name + "</span><br>"
+      + "<span><b>Surname</b>: " + contactForm.surname + "</span><br>"
+      + "<span><b>Email</b>: " + contactForm.email + "</span><br>"
+      + "<span><b>Affiliation</b>: " + contactForm.affiliation + "</span><br>"
+      + "<span><b>Stakeholder Name</b>: " + contactForm.stakeholder + "</span>"
+      + "<p>" + contactForm.message + "</p>"
+      + "</div>";
+    email.recipients = admins;
+    return email;
+  }
+  
   public static composeEmailForFeedback(info: {name: string, url: string, email: string, issues: any[]}, recipients: string[]): Email {
     let email: Email = new Email();
     email.subject = 'Feedback report for ' + info.name;