diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
index 263f142c2e..8be86f17ae 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.html
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -1,3 +1,3 @@
 <ds-register-email-form
-    [MESSAGE_PREFIX]="'forgot-email.form'">
-</ds-register-email-form>
\ No newline at end of file
+    [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="'forgot'">
+</ds-register-email-form>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 9e7b783544..f2a338537d 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -29,6 +29,12 @@ export class RegisterEmailFormComponent implements OnInit {
   @Input()
   MESSAGE_PREFIX: string;
 
+  /**
+   * Type of register request to be done, register new email or forgot password (same endpoint)
+   */
+  @Input()
+  typeRequest: string = null;
+
   validMailDomains: string[];
 
   constructor(
@@ -64,12 +70,8 @@ export class RegisterEmailFormComponent implements OnInit {
    * Register an email address
    */
   register() {
-    const typeMap = new Map<string, string>([
-      ['register-page.registration', 'register'],
-      ['forgot-email.form', 'forgot']
-    ]);
     if (!this.form.invalid) {
-      this.epersonRegistrationService.registerEmail(this.email.value, typeMap.get(this.MESSAGE_PREFIX)).subscribe((response: RemoteData<Registration>) => {
+      this.epersonRegistrationService.registerEmail(this.email.value, this.typeRequest).subscribe((response: RemoteData<Registration>) => {
         if (response.hasSucceeded) {
           this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
             this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
index a60dc4c31e..80b6885272 100644
--- a/src/app/register-page/register-email/register-email.component.html
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -1,3 +1,3 @@
 <ds-register-email-form
-        [MESSAGE_PREFIX]="'register-page.registration'">
+        [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="'register'">
 </ds-register-email-form>