diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html
index 8c8d2004..221d3c13 100644
--- a/Mohem/src/app/authentication/forgot/forgot.component.html
+++ b/Mohem/src/app/authentication/forgot/forgot.component.html
@@ -9,32 +9,20 @@
         <ion-grid>
           
             <ion-item>
-                <img class="item-icon" src="assets/imgs/password.png" item-start />
-                <ion-label>{{'changePassword.newPassword' | translate}}</ion-label>
-                <ion-input required type="password" 
-                  [(ngModel)]="P_NEW_PASSWORD">
-                </ion-input>
-              </ion-item>
-            
-              <ion-item>
-                <img class="item-icon" src="assets/imgs/password.png" item-start />
-                <ion-label>{{'changePassword.confirmPassword' | translate}}</ion-label>
-                <ion-input required type="password" 
-                  [(ngModel)]="P_Confirm_NEW_PASSWORD">
-                </ion-input>
-              </ion-item>
+                <img class="item-icon" src="assets/imgs/username.png" item-start />
+                <ion-label>{{ts.trPK('login','username')}}</ion-label>
+              <ion-input required type="text"  [(ngModel)]="P_USER_NAME">
+              </ion-input>
+            </ion-item>
         
         </ion-grid>
         <page-trailer [small]="true"></page-trailer>
   
-    <footer>
-        <ion-grid>
-            <ion-row class="ion-justify-content-center">
-                <ion-col [size]="10" [sizeLg]="8" [sizeXl]="6" no-padding>
-                    <ion-button (click)="onForgot()" [disabled]="!isValidForm()" expand="block">
-                        {{'general,submit' | translate}} </ion-button>
-                </ion-col>
-            </ion-row>
-        </ion-grid>
-    </footer>
-</ion-content>
\ No newline at end of file
+    
+        
+</ion-content>
+<ion-footer>
+    <div class="centerDiv">
+        <ion-button  color="customnavy"  ion-button  (click)=" userCheck()">{{ts.trPK('login','username')}}</ion-button>
+      </div>
+</ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html
index 043e923d..6385b1f9 100644
--- a/Mohem/src/app/authentication/login/login.component.html
+++ b/Mohem/src/app/authentication/login/login.component.html
@@ -31,8 +31,8 @@
       <a (click)="signUp()">{{ts.trPK('login','signup')}}</a>
     </div>
     <div class="gridDiv">
-      <button class="gridBtn"  ion-button (click)="changeLanguage()">English</button>
-      <button class="gridBtn arTxt"  ion-button (click)="changeLanguage()">عربي</button>
+      <button class="gridBtn"  ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==1}">English</button>
+      <button class="gridBtn arTxt"  ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==2}">عربي</button>
     </div>
  
   </ion-content>
diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss
index 65e02773..08f6520a 100644
--- a/Mohem/src/app/authentication/login/login.component.scss
+++ b/Mohem/src/app/authentication/login/login.component.scss
@@ -1,11 +1,15 @@
 .signupDiv {
     font-size: 14px;
 }
-
 .customGrid {
     margin-bottom: 20px;
 }
-
+.gridBtn.active{
+    background:var(--customnavy) !important;
+    color:var(--light) !important;
+  
+}
+.gridDiv{direction: rtl}
 .pageTitle {
     color: var(--dark);
     font-size: 23px;
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index e547c75a..478f9b15 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -31,6 +31,11 @@ export class LoginComponent implements OnInit, OnDestroy {
     isSupportAr:boolean=false;
     isAppleStore:boolean=false;
     memberLogin: any = {};
+    private currentLang : any;
+    private patientOutSA: boolean;
+    private loginTokenID: string;
+    private isMobileFingerPrint: boolean;
+    private FingerPrintPatientIdentificationID: string;
     constructor(
         public cs: CommonService,
         public authService: AuthenticationService,
@@ -51,6 +56,7 @@ export class LoginComponent implements OnInit, OnDestroy {
             this.checkIfLoggedInBefore();
             // this.splash.hide();
         }, 100);
+        this.currentLang = TranslatorService.getCurrentLanguageCode();
     }
 
     ngOnDestroy(): void {
@@ -58,6 +64,8 @@ export class LoginComponent implements OnInit, OnDestroy {
     }
     public changeLanguage(){
         this.ts.switchLanguage();
+        this.currentLang = TranslatorService.getCurrentLanguageCode();
+        console.log(this.currentLang);
     }
     private checkIfLoggedInBefore() {
         this.cs.startLoading();
@@ -393,11 +401,6 @@ export class LoginComponent implements OnInit, OnDestroy {
             }, null, title);
     }
 
-    private patientOutSA: boolean;
-    private loginTokenID: string;
-    private isMobileFingerPrint: boolean;
-    private FingerPrintPatientIdentificationID: string;
-
     private checkActivationCode(readedCode?) {
         const request = new CheckActivationCodeRequest();
         request.IsMobileFingerPrint = this.isMobileFingerPrint;
@@ -440,7 +443,7 @@ export class LoginComponent implements OnInit, OnDestroy {
             if (this.authService.isAgreedBefore()) {
                 this.cs.openHome();
             } else {
-                this.cs.openAgreement();
+               // this.cs.openAgreement();
             }
         });
     }
diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
index 0a70b492..df787404 100644
--- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
@@ -540,7 +540,7 @@ export class AuthenticationService {
             } else {
                 this.cs.presentConfirmDialog(this.ts.trPK('login', 'enter-email'),
                     () => {
-                        this.cs.openPatientProfile();
+                        //this.cs.openPatientProfile();
                         observer.complete();
                     });
             }
@@ -564,7 +564,7 @@ export class AuthenticationService {
 
     private sessionTimeOutDialog() {
         this.cs.presentConfirmDialog(this.ts.trPK('general', 'idle-relogin'), () => {
-            this.cs.openUserLogin();
+           // this.cs.openUserLogin();
         });
     }