diff --git a/drupal/modules/epal/epal.routing.yml b/drupal/modules/epal/epal.routing.yml
index e3475f52641f1d7aa310420141046dc45d8789d3..d1d9414b541ab922825b8c2eaa66ac939309858f 100644
--- a/drupal/modules/epal/epal.routing.yml
+++ b/drupal/modules/epal/epal.routing.yml
@@ -23,13 +23,13 @@ epal_auth_test:
     _permission: 'access content'
     _user_is_logged_in: 'TRUE'
 current_user:
-  path: '/epal/curuser/{token_name}'
+  path: '/epal/curuser'
   options: 
     _auth: [ 'basic_auth' ]
   defaults:
     _controller: '\Drupal\epal\Controller\CurrentUser::content'
   requirements:
-    _access: 'TRUE'
+    _user_is_logged_in: 'TRUE'
 epal.application_submit:
   path: '/epal/appsubmit'
   options: 
diff --git a/drupal/modules/epal/src/Controller/CurrentUser.php b/drupal/modules/epal/src/Controller/CurrentUser.php
index 70977ef56b333cf59c4f29376de6c591d895398e..218e3adc1e245f64d5d9ce2115efdf98d93f5e90 100644
--- a/drupal/modules/epal/src/Controller/CurrentUser.php
+++ b/drupal/modules/epal/src/Controller/CurrentUser.php
@@ -1,12 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\query_example\Controller\QueryExampleController.
- */
-
-
-
-
 
 namespace Drupal\epal\Controller;
 
@@ -15,26 +7,54 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 
 
 
 class CurrentUser extends ControllerBase {
 
- 
-  public function content($token_name) {
-   
-   $query = \Drupal::database()->select('epal_users', 'nfd');
-   $query->fields('nfd', ['name']);
-   $query->condition('nfd.authtoken', $token_name);
-   $field = $query->execute()->fetchAssoc();
- 
-
-
-
-    $response = new JsonResponse($field);
-    return $response;
-
-  }
+    protected $entityTypeManager;
+    
+    public function __construct(EntityTypeManagerInterface $entityTypeManager )
+    {
+        $this->entityTypeManager1 = $entityTypeManager;
+       
+    }
+
+
+public static function create(ContainerInterface $container) {
+    return new static(
+        $container->get('entity_type.manager'),
+        $container->get('entity.query'),
+        $container->get('entity_field.manager')
+    );
+}
 
+ 
+  public function content(Request $request) {
+    
+      $authToken = $request->headers->get('PHP_AUTH_USER');
+
+  	 
+			$epalUsers = $this->entityTypeManager1->getStorage('epal_users')->loadByProperties(array('authtoken' =>  $authToken)); 
+			$epalUser = reset($epalUsers);
+			if ($epalUser)
+			     {			
+                $currentUserName = $epalUser->name->value;
+
+           			$response = new JsonResponse(['name' =>$currentUserName]);
+            		}
+            		else { 
+            				$response = new Response();
+                    $response->setContent('forbidden');
+                    $response->setStatusCode(Response::HTTP_FORBIDDEN);
+                    $response->headers->set('Content-Type', 'application/json');
+            		}
+
+		    return $response;
+
+	}
 }
diff --git a/source/components/home.ts b/source/components/home.ts
index 46832fa2304fe4a142b3481af6968eb079f7989e..8e8efa416d65820b4cb8147a4f529547e20e9015 100644
--- a/source/components/home.ts
+++ b/source/components/home.ts
@@ -90,7 +90,8 @@ export default class Home implements OnInit {
                 state.loginInfo.reduce(({}, loginInfoToken) => {
                     this.authToken = loginInfoToken.auth_token;
                     this.authRole = loginInfoToken.auth_role;
-                    
+                     if (this.authToken && this.authToken.length > 0)
+                        this.router.navigate(['/epal-class-select']);
                     return loginInfoToken;
                 }, {});
             }
@@ -100,9 +101,6 @@ export default class Home implements OnInit {
        
         // subscribe to router event
         this.activatedRoute.queryParams.subscribe((params: Params) => {
-            this.authToken = params['auth_token'];
-            this.authRole = params['auth_role'];
-            
             if (params) {
                 this.authToken = params['auth_token'];
                 this.authRole = params['auth_role'];
@@ -110,10 +108,6 @@ export default class Home implements OnInit {
          
             if (this.authToken && this.authRole)
                 this._ata.getloginInfo({ auth_token: this.authToken, auth_role: this.authRole});
-                console.log(this.authToken, "tttttttt");
-              if (this.authToken && this.authToken.length > 0)
-                        this.router.navigate(['/epal-class-select']);
-          //  this._ata.saveLoginInfo({ auth_token: this.authToken, auth_role: this.authRole, cu_name:this.name });
      
         });
     }
diff --git a/source/components/navbar/navbar.component.html b/source/components/navbar/navbar.component.html
index c424ab88363ae76e4a96548adc0973f7d9904979..e7ec39c431afccc68aab3cd7d78b67a9702a5bda 100644
--- a/source/components/navbar/navbar.component.html
+++ b/source/components/navbar/navbar.component.html
@@ -1,4 +1,4 @@
-<div class="nav-wrapper">
+<div class="nav-wrapper" class="content">
 <div class="container">
 <nav class="navbar navbar-toggleable-sm">
   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
diff --git a/source/services/helper-data-service.ts b/source/services/helper-data-service.ts
index fd97dfbf18690bf93f483d051a96719484d4463d..2cc3c497ba765f0c3b6a2c24c2cd89250c1966a8 100644
--- a/source/services/helper-data-service.ts
+++ b/source/services/helper-data-service.ts
@@ -233,8 +233,23 @@ export class HelperDataService {
 
 
     getCurrentUser(oauthtoken, oauthrole) {
+
+        this.authToken = oauthtoken;
+        let headers = new Headers({
+            //"Authorization": "Basic cmVzdHVzZXI6czNjckV0MFAwdWwwJA==", // encoded user:pass
+            // "Authorization": "Basic bmthdHNhb3Vub3M6emVtcmFpbWU=",
+            "Content-Type": "application/json",
+            // "Content-Type": "text/plain",  // try to skip preflight
+            //"X-CSRF-Token": "hVtACDJjFRSyE4bgGJENHbXY0B9yNhF71Fw-cYHSDNY"
+            //"X-CSRF-Token": "fj1QtF_Z_p6kE19EdCnN08zoSjVfcT4Up-ciW6I0IG8"
+            "X-CSRF-Token": "LU92FaWYfImfZxfldkF5eVnssdHoV7Aa9fg8K1bWYUc",
+//            "X-oauth-enabled": "true",
+//            "X-Auth-Token": this.authToken
+        });
+        this.createAuthorizationHeader(headers);
+        let options = new RequestOptions({ headers: headers });
            return new Promise((resolve, reject) => {
-            this.http.get(`${AppSettings.API_ENDPOINT}/epal/curuser/${oauthtoken}   `)
+            this.http.get(`${AppSettings.API_ENDPOINT}/epal/curuser`, options)
             .map(response => response.json())
             .subscribe(data => {
                 resolve(this.transformUserSchema(data, oauthtoken, oauthrole));
@@ -256,7 +271,7 @@ transformUserSchema(userlogin:any,oauthtoken:string, oauthrole:string){
             
         }
 
-    signOut() {
+    signOut() { 
         this.loginInfo$.forEach(loginInfoToken => {
             console.log(loginInfoToken.get(0));
             this.authToken = loginInfoToken.get(0).auth_token;
diff --git a/source/store/logininfo/logininfo.reducer.ts b/source/store/logininfo/logininfo.reducer.ts
index 6576fc5b97fde0dc4998fb370e50b00341ac7384..c7d5cfec9bad324e8e0446296a54426a5da70318 100644
--- a/source/store/logininfo/logininfo.reducer.ts
+++ b/source/store/logininfo/logininfo.reducer.ts
@@ -13,7 +13,7 @@ export function loginInfoReducer(state: ILoginInfo = INITIAL_STATE, action): ILo
 		let loginInfoTokens = Array<ILoginInfoToken>();
         let i=0;
         action.payload.loginInfos.forEach(loginInfo => {
-            loginInfoTokens.push(<ILoginInfoToken>{auth_token: loginInfo.auth_token, auth_role: loginInfo.auth_role, cu_name: loginInfo.cu_name, xcsrftoken: loginInfo.xcsrftoken });
+            loginInfoTokens.push(<ILoginInfoToken>{auth_token: loginInfo.auth_token, auth_role: loginInfo.auth_role, cu_name: loginInfo.cu_name});
             i++;
         });
         return Seq(loginInfoTokens).map(n => n).toList();
diff --git a/source/store/logininfo/logininfo.transformers.ts b/source/store/logininfo/logininfo.transformers.ts
index 9c780c6f9199b1de72288b268149f1fca5901a5f..28a5c7924be71a504ffcc0862cbea0ecdeb0c8fa 100644
--- a/source/store/logininfo/logininfo.transformers.ts
+++ b/source/store/logininfo/logininfo.transformers.ts
@@ -3,7 +3,7 @@ import { ILoginInfo, ILoginInfoToken } from './logininfo.types';
 export function deimmutifyLoginInfo(state: ILoginInfo): ILoginInfoToken[] {
     let fetchedLoginInfoTokens = new Array();
     state.forEach(loginInfoToken => {
-        fetchedLoginInfoTokens.push(<ILoginInfoToken>{auth_token: loginInfoToken.auth_token, auth_role: loginInfoToken.auth_role, cu_name: loginInfoToken.cu_name, xcsrftoken: loginInfoToken.xcsrftoken});
+        fetchedLoginInfoTokens.push(<ILoginInfoToken>{auth_token: loginInfoToken.auth_token, auth_role: loginInfoToken.auth_role, cu_name: loginInfoToken.cu_name});
     });
     return fetchedLoginInfoTokens;
 };
diff --git a/source/store/logininfo/logininfo.types.ts b/source/store/logininfo/logininfo.types.ts
index a4b7609515003ff70765e781b704fc8ed575b69a..76671c03b54441fe6135cb001c736a2cbb00cd02 100644
--- a/source/store/logininfo/logininfo.types.ts
+++ b/source/store/logininfo/logininfo.types.ts
@@ -4,7 +4,6 @@ export interface ILoginInfoToken {
     auth_token: string;
     auth_role: string;
     cu_name: string;
-    xcsrftoken:string;
 }
 
 export type ILoginInfo = List<ILoginInfoToken>;