diff --git a/backend/src/main/java/de/szut/casino/user/UserMappingService.java b/backend/src/main/java/de/szut/casino/user/UserMappingService.java
index 578ba49..e0183ec 100644
--- a/backend/src/main/java/de/szut/casino/user/UserMappingService.java
+++ b/backend/src/main/java/de/szut/casino/user/UserMappingService.java
@@ -11,7 +11,7 @@ public class UserMappingService {
     }
 
     public UserEntity mapToUserEntity(CreateUserDto createUserDto) {
-        return new UserEntity(createUserDto.getUsername(), createUserDto.getKeycloakId(), 0);
+        return new UserEntity(createUserDto.getKeycloakId(), createUserDto.getUsername(), 0);
     }
 }
 
diff --git a/frontend/src/app/service/user.service.ts b/frontend/src/app/service/user.service.ts
index 1f415a3..927ba1c 100644
--- a/frontend/src/app/service/user.service.ts
+++ b/frontend/src/app/service/user.service.ts
@@ -1,7 +1,7 @@
 import { inject, Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { KeycloakProfile } from 'keycloak-js';
-import { Observable } from 'rxjs';
+import { catchError, EMPTY, Observable } from 'rxjs';
 import { User } from '../model/User';
 
 @Injectable({
@@ -11,7 +11,7 @@ export class UserService {
   private http: HttpClient = inject(HttpClient);
 
   public getUser(id: string): Observable<User | null> {
-    return this.http.get<User | null>(`/backend/user/${id}`);
+    return this.http.get<User | null>(`/backend/user/${id}`).pipe(catchError(() => EMPTY));
   }
 
   public createUser(id: string, username: string): Observable<User> {
diff --git a/frontend/src/app/shared/components/navbar/navbar.component.ts b/frontend/src/app/shared/components/navbar/navbar.component.ts
index ba86e73..53d1dee 100644
--- a/frontend/src/app/shared/components/navbar/navbar.component.ts
+++ b/frontend/src/app/shared/components/navbar/navbar.component.ts
@@ -18,7 +18,7 @@ export class NavbarComponent {
   login() {
     try {
       const baseUrl = window.location.origin;
-      this.keycloakService.login({ redirectUri: `${baseUrl}/home` });
+      this.keycloakService.login({ redirectUri: `${baseUrl}/login/success` });
     } catch (error) {
       console.error('Login failed:', error);
     }