diff --git a/Frontend Angular 4/src/app/login/login.component.html b/Frontend Angular 4/src/app/login/login.component.html
index aa35b416131b20071fccae0a0728ecc7b956f853..51805f4cb963e74ab629a71c6d860870b45656a4 100755
--- a/Frontend Angular 4/src/app/login/login.component.html	
+++ b/Frontend Angular 4/src/app/login/login.component.html	
@@ -9,7 +9,13 @@
                     </div>
 
                     <div class="form-group">
-                        <input type="password" [(ngModel)]=model.password (keyup.enter)=login() name="password" class="form-control input-underline input-lg"  placeholder='{{ "i18n.object.password" | translate | titleCase }}'>
+                        <input
+                            type="password"
+                            [(ngModel)]=model.password
+                            (keyup.enter)=login()
+                            name="password"
+                            class="form-control input-underline input-lg"
+                            placeholder='{{ "i18n.object.password" | translate | titleCase }}'>
                     </div>
                     <div class="form-group" style="margin-bottom: 0px; text-align: left;">
                         <div ngbDropdown class="d-inline-block language-switcher">
diff --git a/Frontend Angular 4/src/app/login/login.component.ts b/Frontend Angular 4/src/app/login/login.component.ts
index 49d9079f7c89b10b4ba82ab8acfc687b32a53fd3..d7a6dd2e8488b9c9db6b3e18255f92f0258b3a22 100755
--- a/Frontend Angular 4/src/app/login/login.component.ts	
+++ b/Frontend Angular 4/src/app/login/login.component.ts	
@@ -37,6 +37,12 @@ export class LoginComponent implements OnInit {
         ) { }
 
     ngOnInit() {
+        let currentSession = sessionStorage.getItem("currentUser"); 
+        let langCode = currentSession ? JSON.parse(currentSession).language : 'es';
+        if (langCode) {
+            this.model.language = this.getLanguageElementByCode(langCode);
+        }
+
         // reset login status
         this.authenticationService.logout();
 
@@ -84,4 +90,15 @@ export class LoginComponent implements OnInit {
         this.translate.use(this.model.language.code);
     }
 
+    getLanguageElementByCode(code) {
+        let langElement = null;
+        for(let lang of this.languages) {
+            if (lang.code === code) {
+                langElement = lang;
+                break;
+            }
+        };
+        return langElement;
+    }
+
 }