diff --git a/src/app/authentication.service.ts b/src/app/authentication.service.ts
index 7d987594c5e2240c1f0cb396dfd8ad6cbc0c3118..16cd8703074089043547486b7be5164f7d5989e9 100644
--- a/src/app/authentication.service.ts
+++ b/src/app/authentication.service.ts
@@ -92,13 +92,4 @@ export class AuthenticationService {
     return this.user.token;
   }
 
-  setToken(token?: string): boolean {
-    // Initial check for token
-    if (!token) {
-      token = this.getToken();
-      return true;
-    }
-
-    return true;
-  }
 }
diff --git a/src/app/user.ts b/src/app/user.ts
index 88885094ad742876bc0883a5fc4813648bea40d5..8866e2aaf3a0b18c67351143b28b06e79d42618e 100644
--- a/src/app/user.ts
+++ b/src/app/user.ts
@@ -2,14 +2,14 @@ import { AuthProvider } from './auth-provider';
 import { UserRole } from './user-roles.enum';
 
 export class User {
-  userId: string;
+  id: string;
   loginId: string;
   authProvider: AuthProvider;
   token: string;
   userRole: UserRole;
 
-  constructor(userId: string, loginId: string, authProvider: AuthProvider, token: string, userRole: UserRole) {
-    this.userId = userId;
+  constructor(id: string, loginId: string, authProvider: AuthProvider, token: string, userRole: UserRole) {
+    this.id = id;
     this.loginId = loginId;
     this.authProvider = authProvider;
     this.token = token;