diff --git a/src/app/approutes.module.ts b/src/app/approutes.module.ts
index 537dc94..2412be7 100644
--- a/src/app/approutes.module.ts
+++ b/src/app/approutes.module.ts
@@ -122,6 +122,15 @@
         canActivate: [AuthGuardService]
     },
     {
+        path: 'forgotpassword',
+        component: ChangePasswordComponent
+    },
+    {
+        path: 'forgotpassword/changepassword/:id',
+        component: ChangePasswordComponent,
+        canActivate: [AuthGuardService]
+    },
+    {
         path: '**',
         component: PageNotFoundComponent
     }
diff --git a/src/app/login/LoginComponent.html b/src/app/login/LoginComponent.html
index 12c88f2..65f4a80 100644
--- a/src/app/login/LoginComponent.html
+++ b/src/app/login/LoginComponent.html
@@ -47,7 +47,9 @@
             <div class="signup-text-center">
                 <span class="caret">{{'PAGE.LOGIN.SIGNINMSG' | translate}}</span>
             </div>
-
+            <div class="signup-text-center">
+                <span routerLink="/forgotpassword" class="caret forget">{{'PAGE.USERS.FORGOT' | translate}} ?</span>
+            </div>
         </form>
     </div>
 </div>
diff --git a/src/app/login/LoginComponent.scss b/src/app/login/LoginComponent.scss
index 895fe22..ed938b4 100644
--- a/src/app/login/LoginComponent.scss
+++ b/src/app/login/LoginComponent.scss
@@ -172,4 +172,7 @@
   width: 400px;
   @include background(null, $primary, null, null, null);
   color: $white;
+}
+.forget{
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/app/users/add-user/AddEditUserComponent.html b/src/app/users/add-user/AddEditUserComponent.html
index 6ae0f32..9701665 100644
--- a/src/app/users/add-user/AddEditUserComponent.html
+++ b/src/app/users/add-user/AddEditUserComponent.html
@@ -20,15 +20,15 @@
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{userTitle}}</h4>
       <button *ngIf="!isFirstLogin" class="button-xs" type="button" class="close" aria-label="Close"
-        (click)="activeModal.close()">
+        (click)="close()">
         <i class="fas fa-times-circle text-danger"></i>
       </button>
     </div>
     <div class="modal-body">
       <label class="col-sm-12 col-form-label mandatory-label"
-        [ngClass]="{'text-danger': userForm.invalid === true && submitted === true,'message': isPassword && userForm.invalid === true && submitted  }">{{'MANDATORYCHECK'|
+        [ngClass]="{'text-danger': userForm.invalid === true && submitted === true && isOtp === false,'message': isPassword && userForm.invalid === true && submitted }">{{'MANDATORYCHECK'|
         translate}}</label>
-      <div class="row form-group mb-3" *ngIf="userType === 'add' || userType === 'editUserName'">
+      <div class="row form-group mb-3" *ngIf="userType === 'add' || userType === 'editUserName'|| userType === 'forgotPassword'">
         <div class="col-sm-4">
           <label for="userName">{{'PAGE.USERS.USERNAME' | translate}} *</label>
         </div>
@@ -42,7 +42,30 @@
             {{'PAGE.LOGIN.USERNAMEMINLENGTHVALIDMESSAGE' | translate}} </div>
         </div>
       </div>
-      <ng-container *ngIf="userType === 'add' || userType === 'editPassword' || userType === 'changePassword'">
+      <div class="row form-group mb-3"
+        *ngIf="userType === 'add' || userType === 'editmail' || userType === 'forgotPassword'">
+        <div class="col-sm-4">
+          <label  *ngIf="userType === 'editmail' || userType === 'add'" for="email">{{'PAGE.USERS.EMAIL' | translate}}</label>
+          <label  *ngIf="userType === 'forgotPassword'" for="email">{{'PAGE.USERS.EMAIL' | translate}} *</label>
+        </div>
+        <div class="col-sm-8">
+          <input class="form-control" placeholder="{{'PAGE.USERS.EMAIL' | translate}}" type="text" formControlName="email_id"
+            id="email" [ngClass]="{ 'is-invalid': submitted && f.email_id.errors }" required>
+        </div>
+      </div>
+      <ng-container *ngIf="isOtp">
+        <div class="row form-group mb-3">
+          <div class="col-sm-4">
+            <label for="otp">{{'PAGE.USERS.OTP' | translate}} *</label>
+          </div>
+          <div class="col-sm-8">
+            <input class="form-control" placeholder="{{'PAGE.USERS.OTP' | translate}}" type="text" formControlName="otp" id="otp"
+              [ngClass]="{ 'is-invalid': submitted && f.otp.errors && isOtp === false }" required>
+          </div>
+        </div>
+      </ng-container>
+      <ng-container
+        *ngIf="userType === 'editPassword' || userType === 'add' || userType === 'changePassword' || userType === 'change_password'">
         <div class="row form-group mb-3" *ngIf=" userType === 'changePassword'">
           <div class="col-sm-4">
             <label for="oldpassword">{{'PAGE.USERS.OLDPASSWORD' | translate}} *</label>
@@ -68,7 +91,7 @@
               {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}} </div>
           </div>
         </div>
-        <div class="row form-group mb-3" *ngIf="userType === 'changePassword'">
+        <div class="row form-group mb-3" *ngIf="userType === 'changePassword' || userType === 'change_password'">
           <div class="col-sm-4">
             <label for="password">{{'PAGE.USERS.NEWPASSWORD' | translate}} *</label>
           </div>
@@ -83,7 +106,7 @@
               {{'PAGE.LOGIN.PASSWORDMINLENGTHVALIDMESSAGE' | translate}} </div>
           </div>
         </div>
-        <div class="row form-group mb-3">
+        <div class="row form-group mb-3" *ngIf= "userType === 'editPassword' || userType === 'add'|| userType === 'change_password'|| userType === 'changePassword'">
           <div class="col-sm-4">
             <label for="password2">{{'PAGE.USERS.CONFPASSWORD' | translate}} *</label>
           </div>
diff --git a/src/app/users/add-user/AddEditUserComponent.ts b/src/app/users/add-user/AddEditUserComponent.ts
index a816c62..5226d5b 100644
--- a/src/app/users/add-user/AddEditUserComponent.ts
+++ b/src/app/users/add-user/AddEditUserComponent.ts
@@ -19,8 +19,9 @@
  * @file Add Edit Component.
  */
 import { HttpHeaders } from '@angular/common/http';
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Injector, Input, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { NotifierService } from 'angular-notifier';
@@ -28,6 +29,7 @@
 import { APIURLHEADER, ERRORDATA, LOGINPARAMS, MODALCLOSERESPONSEDATA, TYPESECTION } from 'CommonModel';
 import { environment } from 'environment';
 import { RestService } from 'RestService';
+import { Observable } from 'rxjs';
 import { SharedService, isNullOrUndefined } from 'SharedService';
 
 /**
@@ -65,21 +67,45 @@
     /** Input contains Modal dialog component Instance @public */
     @Input() public userName: string;
 
+    /** Input contains Modal dialog component Instance @public */
+    @Input() public email: string;
+
     /** Check the loading results for loader status @public */
     public isLoadingResults: boolean = false;
 
     /** Give the message for the loading @public */
     public message: string = 'PLEASEWAIT';
 
+    /** Contains token @public */
+    public idToken: string;
+
     /** Holds list of domains @public */
     public domains: TYPESECTION[] = [];
 
     /** Variable contains type is changepassword or not @public */
     public isPassword: boolean;
 
+    /** Variable contains type is forgotpassword or not @public */
+    public isforgetPassword: boolean;
+
+    /** Variable contains to show otp or not @public */
+    public isOtp: boolean = false;
+
     /** Variable holds value for first login user @public */
     public isFirstLogin: boolean = Boolean(sessionStorage.getItem('firstLogin') === 'true');
 
+    /** Observable Hold the value of subscription  @public */
+    public isForgotPassword$: Observable<boolean>;
+
+    /** Observable Hold the value of subscription  @public */
+    public forgotPassword: boolean;
+
+    /** Variable contains payload @private */
+    private payload: {};
+
+    /** Variable contains add user payload @private */
+    private addPayload: {};
+
     /** Instance of the rest service @private */
     private restService: RestService;
 
@@ -104,6 +130,12 @@
     /** Utilizes auth service for any auth operations @private */
     private authService: AuthenticationService;
 
+    /** Holds the instance of router class @private */
+    private router: Router;
+
+    /** Detect changes for the User Input */
+    private cd: ChangeDetectorRef;
+
     constructor(injector: Injector) {
         this.injector = injector;
         this.formBuilder = this.injector.get(FormBuilder);
@@ -113,14 +145,18 @@
         this.translateService = this.injector.get(TranslateService);
         this.sharedService = this.injector.get(SharedService);
         this.authService = this.injector.get(AuthenticationService);
+        this.router = this.injector.get(Router);
+        this.cd = this.injector.get(ChangeDetectorRef);
 
         /** Initializing Form Action */
         this.userForm = this.formBuilder.group({
             userName: ['', Validators.required],
+            email_id: [null, [Validators.required, Validators.pattern(this.sharedService.REGX_EMAIL_PATTERN)]],
             password: [null, [Validators.required, Validators.pattern(this.sharedService.REGX_PASSWORD_PATTERN)]],
             password2: [null, Validators.required],
             old_password: [null, Validators.required],
-            domain_name: [null]
+            domain_name: [null],
+            otp: [null]
         });
     }
 
@@ -140,16 +176,20 @@
             this.userForm.patchValue({ userName: this.userName });
         } else if (this.isFirstLogin) {
             this.isPassword = true;
+        } else if (this.userType === 'editmail') {
+            this.userForm.patchValue({ email_id: this.email });
         }
     }
 
     /** On modal submit users acction will called @public */
     public userAction(userType: string): void {
-        if (userType === 'editPassword') {
+        if (userType === 'editPassword' || this.isforgetPassword || userType === 'change_password') {
             this.getFormControl('userName').setValidators([]);
             this.getFormControl('userName').updateValueAndValidity();
             this.getFormControl('old_password').setValidators([]);
             this.getFormControl('old_password').updateValueAndValidity();
+            this.getFormControl('email_id').setValidators([]);
+            this.getFormControl('email_id').updateValueAndValidity();
         } else if (userType === 'editUserName') {
             this.getFormControl('password').setValidators([]);
             this.getFormControl('password').updateValueAndValidity();
@@ -157,13 +197,20 @@
             this.getFormControl('password2').updateValueAndValidity();
             this.getFormControl('old_password').setValidators([]);
             this.getFormControl('old_password').updateValueAndValidity();
+            this.getFormControl('email_id').setValidators([]);
+            this.getFormControl('email_id').updateValueAndValidity();
         } else if (userType === 'changePassword') {
             this.getFormControl('userName').setValidators([]);
             this.getFormControl('userName').updateValueAndValidity();
+            this.getFormControl('email_id').setValidators([]);
+            this.getFormControl('email_id').updateValueAndValidity();
         } else if (userType === 'add') {
             this.getFormControl('old_password').setValidators([]);
             this.getFormControl('old_password').updateValueAndValidity();
+            this.getFormControl('email_id').setValidators([]);
+            this.getFormControl('email_id').updateValueAndValidity();
         }
+        this.checkType(userType);
         this.submitted = true;
         this.modalData = {
             message: 'Done'
@@ -176,25 +223,153 @@
             }
             if (userType === 'add') {
                 this.addUser();
+            } else if (userType === 'forgotPassword') {
+                this.forgetPassword();
+            } else if (userType === 'change_password') {
+                this.changePassword();
             } else {
                 this.editUser();
             }
         }
     }
 
+    /** Used to set the validation and value and update the validation and value @public */
+    public checkType(userType: string): void {
+        if (userType === 'forgotPassword') {
+            this.getFormControl('password').setValidators([]);
+            this.getFormControl('password').updateValueAndValidity();
+            this.getFormControl('password2').setValidators([]);
+            this.getFormControl('password2').updateValueAndValidity();
+            this.getFormControl('old_password').setValidators([]);
+            this.getFormControl('old_password').updateValueAndValidity();
+        } else if (userType === 'editmail') {
+            this.getFormControl('password').setValidators([]);
+            this.getFormControl('password').updateValueAndValidity();
+            this.getFormControl('password2').setValidators([]);
+            this.getFormControl('password2').updateValueAndValidity();
+            this.getFormControl('old_password').setValidators([]);
+            this.getFormControl('old_password').updateValueAndValidity();
+            this.getFormControl('userName').setValidators([]);
+            this.getFormControl('userName').updateValueAndValidity();
+        }
+    }
+
+    /** Forgot password @public */
+    public forgetPassword(): void {
+        this.isLoadingResults = true;
+        if (isNullOrUndefined(this.userForm.value.otp)) {
+            this.payload = JSON.stringify({
+                username: (this.userForm.value.userName).toLowerCase(),
+                email_id: (this.userForm.value.email_id)
+            });
+        } else {
+            this.getFormControl('userName').enable();
+            this.payload = JSON.stringify({
+                username: (this.userForm.value.userName).toLowerCase(),
+                otp: (this.userForm.value.otp)
+            });
+        }
+        const apiURLHeader: APIURLHEADER = {
+            url: environment.GENERATETOKEN_URL,
+            httpOptions: { headers: this.headers }
+        };
+        this.restService.postResource(apiURLHeader, this.payload).subscribe((result:
+            { email: string, id: string, user_id: string, message: string, otp: string }
+        ): void => {
+            if (result.email === 'sent') {
+                this.getFormControl('userName').disable();
+                this.getFormControl('email_id').disable();
+                this.isOtp = true;
+                this.cd.detectChanges();
+                this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.USERSUCCESSFULLY'));
+            }
+            if (result.message === 'valid_otp') {
+                this.activeModal.close(this.modalData);
+                this.getFormControl('email_id').enable();
+                sessionStorage.setItem('id_token', result.id);
+                sessionStorage.setItem('user_id', result.user_id);
+                sessionStorage.setItem('mail', this.userForm.value.email_id);
+                this.userType = 'change_password';
+                sessionStorage.setItem('usertype', this.userType);
+                this.idToken = sessionStorage.getItem('id_token');
+                this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.OTPSUCCESSFULLY'));
+                if (!isNullOrUndefined(sessionStorage.getItem('id_token')) && !isNullOrUndefined(sessionStorage.getItem('mail'))) {
+                    this.authService.forgotPassword.next(true);
+                    this.isForgotPassword$ = this.authService.forgotPassword;
+                    this.authService.isForgotPassword.subscribe((res: boolean): void => {
+                        this.forgotPassword = res;
+                    });
+                    if (this.forgotPassword === true) {
+                        this.router.navigate(['/forgotpassword/changepassword/', encodeURI(this.idToken)]).catch((): void => {
+                            // Catch Navigation Error
+                        });
+                    }
+                }
+            } else if (result.otp === 'invalid') {
+                this.getFormControl('userName').disable();
+                this.notifierService.notify('warning', this.translateService.instant('PAGE.USERS.INVALIDOTP'));
+            }
+            this.isLoadingResults = false;
+        }, (error: ERRORDATA): void => {
+            // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+            if (error.error.status === 401 || error.error.status === 429 || error.error.status === 404) {
+                this.activeModal.close(this.modalData);
+                this.router.navigate(['/login']).catch((): void => {
+                    // Catch Navigation Error
+                });
+            }
+            this.restService.handleError(error, 'post');
+            this.isLoadingResults = false;
+        });
+    }
+
+    /** Change password @public */
+    public changePassword(): void {
+        this.isLoadingResults = true;
+        this.userID = sessionStorage.getItem('user_id');
+        const payLoad: LOGINPARAMS = {};
+        payLoad.password = (this.userForm.value.password);
+        payLoad.email_id = (sessionStorage.getItem('mail'));
+        const apiURLHeader: APIURLHEADER = {
+            url: environment.USERS_URL + '/' + this.userID,
+            httpOptions: { headers: this.headers }
+        };
+        this.restService.patchResource(apiURLHeader, payLoad).subscribe((result: {}): void => {
+            this.activeModal.close(this.modalData);
+            this.router.navigate(['/login']).catch((): void => {
+                // Catch Navigation Error
+            });
+            this.authService.logoutResponse();
+            this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.CHANGEDSUCCESSFULLY'));
+            this.isLoadingResults = false;
+        }, (error: ERRORDATA): void => {
+            this.restService.handleError(error, 'put');
+            this.isLoadingResults = false;
+        });
+    }
+
     /** Add user @public */
     public addUser(): void {
         this.isLoadingResults = true;
-        const payLoad: {} = JSON.stringify({
-            username: (this.userForm.value.userName).toLowerCase(),
-            password: (this.userForm.value.password),
-            domain_name: !isNullOrUndefined(this.userForm.value.domain_name) ? this.userForm.value.domain_name : undefined
-        });
+        if (!isNullOrUndefined(this.userForm.value.email_id) && this.userForm.value.email_id !== '') {
+            this.addPayload = JSON.stringify({
+                username: (this.userForm.value.userName).toLowerCase(),
+                password: (this.userForm.value.password),
+                email_id: (this.userForm.value.email_id),
+                domain_name: !isNullOrUndefined(this.userForm.value.domain_name) ? this.userForm.value.domain_name : undefined
+            });
+        } else {
+            this.addPayload = JSON.stringify({
+                username: (this.userForm.value.userName).toLowerCase(),
+                password: (this.userForm.value.password),
+                domain_name: !isNullOrUndefined(this.userForm.value.domain_name) ? this.userForm.value.domain_name : undefined
+            });
+        }
         const apiURLHeader: APIURLHEADER = {
             url: environment.USERS_URL,
             httpOptions: { headers: this.headers }
         };
-        this.restService.postResource(apiURLHeader, payLoad).subscribe((result: {}): void => {
+        this.restService.postResource(apiURLHeader, this.addPayload).subscribe((result: {}): void => {
             this.activeModal.close(this.modalData);
             this.isLoadingResults = false;
             this.notifierService.notify('success', this.translateService.instant('PAGE.USERS.CREATEDSUCCESSFULLY'));
@@ -213,7 +388,10 @@
         } else if (this.userType === 'changePassword') {
             payLoad.password = (this.userForm.value.password);
             payLoad.old_password = (this.userForm.value.old_password);
-        } else {
+        } else if (this.userType === 'editmail') {
+            payLoad.email_id = (this.userForm.value.email_id);
+        }
+        else {
             payLoad.username = this.userForm.value.userName.toLowerCase();
         }
         const apiURLHeader: APIURLHEADER = {
@@ -248,6 +426,17 @@
         if (this.isFirstLogin) {
             this.activeModal.close(this.modalData);
             this.authService.destoryToken();
+        } else if (this.userType === 'forgotPassword') {
+            this.activeModal.close(this.modalData);
+            this.router.navigate(['/login']).catch((): void => {
+                // Catch Navigation Error
+            });
+        } else if (this.userType === 'change_password') {
+            this.authService.logoutResponse();
+            this.activeModal.close(this.modalData);
+            this.router.navigate(['/forgotpassword']).catch((): void => {
+                // Catch Navigation Error
+            });
         } else {
             this.activeModal.close(this.modalData);
         }
diff --git a/src/app/users/user-details/UserDetailsComponent.ts b/src/app/users/user-details/UserDetailsComponent.ts
index 65ef878..99670f0 100644
--- a/src/app/users/user-details/UserDetailsComponent.ts
+++ b/src/app/users/user-details/UserDetailsComponent.ts
@@ -252,7 +252,8 @@
       identifier: userData._id,
       user_status: userData._admin.user_status,
       account_expire_time: (!isNullOrUndefined(userData._admin) && !isNullOrUndefined(userData._admin.account_expire_time)) ? this.sharedService.convertEpochTime(
-        userData._admin.account_expire_time) : 'N/A'
+        userData._admin.account_expire_time) : 'N/A',
+        email_id: userData.email_id
     };
     this.userData.push(userDataObj);
   }
diff --git a/src/app/utilities/change-password/ChangePasswordComponent.ts b/src/app/utilities/change-password/ChangePasswordComponent.ts
index 2b32a8b..ad2fa32 100644
--- a/src/app/utilities/change-password/ChangePasswordComponent.ts
+++ b/src/app/utilities/change-password/ChangePasswordComponent.ts
@@ -19,6 +19,7 @@
  * @file change password component
  */
 import { Component, Injector, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { AddEditUserComponent } from 'AddEditUserComponent';
@@ -50,11 +51,14 @@
     /** Instance of the modal service @private */
     private modalService: NgbModal;
 
+    /** Holds the instance of router class @private */
+    private router: Router;
     constructor(injector: Injector) {
         this.injector = injector;
         this.translateService = this.injector.get(TranslateService);
         this.sharedService = this.injector.get(SharedService);
         this.modalService = this.injector.get(NgbModal);
+        this.router = this.injector.get(Router);
     }
 
     /** Lifecyle Hooks the trigger before component is instantiate @public */
@@ -65,6 +69,14 @@
         if (this.editType === 'changePassword') {
             modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.EDITCREDENTIALS');
         }
+        if (this.router.url === '/forgotpassword') {
+            this.editType = 'forgotPassword';
+            modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.FORGOT');
+        }
+        if (this.router.url.startsWith('/forgotpassword/changepassword/')) {
+            this.editType = 'change_password';
+            modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.EDITCREDENTIALS');
+        }
         modalRef.componentInstance.userType = this.editType;
         modalRef.result.then((result: MODALCLOSERESPONSEDATA): void => {
             if (result) {
diff --git a/src/app/utilities/users-action/UsersActionComponent.html b/src/app/utilities/users-action/UsersActionComponent.html
index 69bf2ab..ca5affe 100644
--- a/src/app/utilities/users-action/UsersActionComponent.html
+++ b/src/app/utilities/users-action/UsersActionComponent.html
@@ -33,6 +33,10 @@
                 placement="left" container="body" ngbTooltip="{{'PAGE.USERS.EDITUSERNAME' | translate}}">
                 <i class="fas fa-user-edit"></i> {{'PAGE.USERS.EDITUSERNAME' | translate}}
             </button>
+            <button type="button" class="btn btn-primary dropdown-item" (click)="editUserModal('editmail')"
+                placement="left" container="body" ngbTooltip="{{'PAGE.USERS.CHANGEMAIL' | translate}}">
+                <i class="fas fa-envelope"></i> {{'PAGE.USERS.CHANGEMAIL' | translate}}
+            </button>
             <button type="button" class="btn btn-primary dropdown-item" (click)="projectRolesModal()" placement="left"
                 container="body" ngbTooltip="{{'PAGE.USERS.PROJECTSROLES' | translate}}">
                 <i class="fas fa-user-check"></i> {{'PAGE.USERS.PROJECTSROLES' | translate}}
diff --git a/src/app/utilities/users-action/UsersActionComponent.ts b/src/app/utilities/users-action/UsersActionComponent.ts
index a7b4c24..4f45f81 100644
--- a/src/app/utilities/users-action/UsersActionComponent.ts
+++ b/src/app/utilities/users-action/UsersActionComponent.ts
@@ -100,11 +100,14 @@
         modalRef.componentInstance.userID = this.value.identifier;
         if (editType === 'editPassword') {
             modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.EDITCREDENTIALS');
+        } else if (editType === 'editmail') {
+            modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.CHANGEMAIL');
         } else {
             modalRef.componentInstance.userTitle = this.translateService.instant('PAGE.USERS.EDITUSERNAME');
         }
         modalRef.componentInstance.userType = editType;
         modalRef.componentInstance.userName = this.value.username;
+        modalRef.componentInstance.email = this.value.email_id;
         modalRef.result.then((result: MODALCLOSERESPONSEDATA) => {
             if (result) {
                 this.sharedService.callData();
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 76607a1..870897c 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -353,7 +353,14 @@
             "RENEW": "Benutzer erneuern",
             "CHANGEDSUCCESSFULLY": "Das Passwort wurde erfolgreich geändert",
             "UNLOCKUSER": "Der Benutzer wurde erfolgreich entsperrt",
-            "RENEWUSER": "Der Benutzer wurde erfolgreich erneuert"
+            "RENEWUSER": "Der Benutzer wurde erfolgreich erneuert",
+            "CHANGEMAIL": "Ändern Sie die E-Mail",
+            "FORGOT": "Passwort vergessen",
+            "OTPSUCCESSFULLY": "OTP wurde erfolgreich validiert",
+            "USERSUCCESSFULLY": "Der Benutzer wurde erfolgreich validiert",
+            "INVALIDOTP": "Ungültiges OTP",
+            "EMAIL": "Email",
+            "OTP": "OTP"
         },
         "TOPOLOGY": {
             "SELECTELEMENT": "Element auswählen",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index d5cc7ae..375b9a5 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -353,7 +353,14 @@
             "RENEW": "Renew User",
             "CHANGEDSUCCESSFULLY": "Password has been changed successfully",
             "UNLOCKUSER": "User has been unlocked successfully",
-            "RENEWUSER": "User has been renewed successfully"
+            "RENEWUSER": "User has been renewed successfully",
+            "CHANGEMAIL": "Change Email",
+            "FORGOT": "Forgot Password",
+            "OTPSUCCESSFULLY": "OTP has been validated successfully",
+            "USERSUCCESSFULLY": "User has been validated successfully",
+            "INVALIDOTP": "Invalid OTP",
+            "EMAIL": "Email",
+            "OTP": "OTP"
         },
         "TOPOLOGY": {
             "SELECTELEMENT": "Select Element",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index 01af08f..2a5c884 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -353,7 +353,14 @@
             "RENEW": "Renovar usuario",
             "CHANGEDSUCCESSFULLY": "La contraseña ha sido cambiada con éxito",
             "UNLOCKUSER": "El usuario ha sido desbloqueado con éxito",
-            "RENEWUSER": "El usuario ha sido renovado con éxito"
+            "RENEWUSER": "El usuario ha sido renovado con éxito",
+            "CHANGEMAIL": "Cambiar e-mail",
+            "FORGOT": "Has olvidado tu contraseña",
+            "OTPSUCCESSFULLY": "OTP ha sido validado con éxito",
+            "USERSUCCESSFULLY": "El usuario ha sido validado exitosamente",
+            "INVALIDOTP": "OTP no válida",
+            "EMAIL": "Correo electrónico",
+            "OTP": "OTP"
         },
         "TOPOLOGY": {
             "SELECTELEMENT": "Seleccionar elemento",
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index ca99d03..e24b3ed 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -353,7 +353,14 @@
             "RENEW": "Renovar usuário",
             "CHANGEDSUCCESSFULLY": "A senha foi alterada com sucesso",
             "UNLOCKUSER": "O usuário foi desbloqueado com sucesso",
-            "RENEWUSER": "O usuário foi renovado com sucesso"
+            "RENEWUSER": "O usuário foi renovado com sucesso",
+            "CHANGEMAIL": "Mude o e-mail",
+            "FORGOT": "Esqueceu sua senha",
+            "OTPSUCCESSFULLY": "OTP foi validado com sucesso",
+            "USERSUCCESSFULLY": "O usuário foi validado com sucesso",
+            "INVALIDOTP": "OTP inválido",
+            "EMAIL": "E-mail",
+            "OTP": "OTP"
         },
         "TOPOLOGY": {
             "SELECTELEMENT": "Selecionar elemento",
diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
index 581bbfb..271b297 100644
--- a/src/models/CommonModel.ts
+++ b/src/models/CommonModel.ts
@@ -342,6 +342,7 @@
     username?: string;
     password?: string;
     old_password?: string;
+    email_id?: string;
 }
 /** Interface for the LABELVALUE */
 export interface LABELVALUE {
diff --git a/src/models/UserModel.ts b/src/models/UserModel.ts
index e49670a..babf2c3 100644
--- a/src/models/UserModel.ts
+++ b/src/models/UserModel.ts
@@ -39,6 +39,7 @@
     project_role_mappings?: ProjectRoleMappings[];
     account_expire_time: string;
     password_expire_time?: string;
+    email_id?: string;
 }
 
 /** Interface for user role mappings */
@@ -65,6 +66,7 @@
     identifier: string;
     user_status: string;
     account_expire_time?: string;
+    email_id?: string;
 }
 
 /** Interface for Project Roles Mappings */
diff --git a/src/services/AuthGuardService.ts b/src/services/AuthGuardService.ts
index 3e0ef8f..05d3a1e 100644
--- a/src/services/AuthGuardService.ts
+++ b/src/services/AuthGuardService.ts
@@ -49,10 +49,11 @@
         // eslint-disable-next-line deprecation/deprecation
         return combineLatest(
             this.authService.isLoggedIn,
-            this.authService.isChangePassword
+            this.authService.isChangePassword,
+            this.authService.isForgotPassword
         ).pipe(
-            map(([isLoggedIn, changePassword]: [boolean, boolean]): boolean => {
-                if (changePassword || isLoggedIn) {
+            map(([isLoggedIn, changePassword, forgotPassword]: [boolean, boolean, boolean]): boolean => {
+                if (changePassword || isLoggedIn || forgotPassword) {
                     return true;
                 } else {
                     this.router.navigate(['/login']).catch((): void => {
diff --git a/src/services/AuthenticationService.ts b/src/services/AuthenticationService.ts
index 904c1cf..e839f75 100644
--- a/src/services/AuthenticationService.ts
+++ b/src/services/AuthenticationService.ts
@@ -65,6 +65,9 @@
     /** Holds the change password in condition of type BehaviorSubject<boolean> @private */
     private changePassword: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+    /** Holds the forgotpassword in condition of type BehaviorSubject<string> @public */
+    public forgotPassword: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
     /** Hold Rest Service Objects */
     private restService: RestService;
 
@@ -116,6 +119,13 @@
     }
 
     /**
+     * Get method for  Observable forgotssword
+     */
+    get isForgotPassword(): Observable<boolean> {
+        return this.forgotPassword.asObservable();
+    }
+
+    /**
      * Get method for Observable Username
      */
     get username(): Observable<string> {
diff --git a/src/services/RestService.ts b/src/services/RestService.ts
index 5f47fb1..e333627 100644
--- a/src/services/RestService.ts
+++ b/src/services/RestService.ts
@@ -157,6 +157,9 @@
         } else if (err.error.status === HttpStatus.CONFLICT) {
             this.notifierService.notify('error', err.error.detail !== undefined ?
                 err.error.detail : this.translateService.instant('HTTPERROR.409'));
+            if (sessionStorage.getItem('usertype') !== 'change_password') {
+                this.activeModal.dismissAll();
+            }
             this.activeModal.dismissAll();
         } else if (err.error.status === HttpStatus.INTERNAL_SERVER_ERROR) {
             this.notifierService.notify('error', err.error.detail !== undefined ?
diff --git a/src/services/SharedService.ts b/src/services/SharedService.ts
index 00f0a63..61c3367 100644
--- a/src/services/SharedService.ts
+++ b/src/services/SharedService.ts
@@ -81,6 +81,9 @@
     /** Variables to hold regexp pattern for Longitude */
     public REGX_LONG_PATTERN: RegExp = new RegExp(/^(\+|-)?(?:180(?:(?:\.0{1,6})?)|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:(?:\.[0-9]{1,15})?))$/);
 
+    /** Variable to hold regexp pattern for EMAIL */
+    public REGX_EMAIL_PATTERN: RegExp = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
     /** Variables to hold maxlength for the description @public */
     // eslint-disable-next-line @typescript-eslint/no-magic-numbers
     public MAX_LENGTH_DESCRIPTION: number = 500;