diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts
index 2d53d28..02b958c 100644
--- a/frontend/src/app/app.routes.ts
+++ b/frontend/src/app/app.routes.ts
@@ -12,5 +12,5 @@ export const routes: Routes = [
     path: 'home',
     component: HomepageComponent,
     canActivate: [authGuard],
-  }
+  },
 ];
diff --git a/frontend/src/app/homepage/homepage/homepage.component.ts b/frontend/src/app/homepage/homepage/homepage.component.ts
index 1f01382..ff894dc 100644
--- a/frontend/src/app/homepage/homepage/homepage.component.ts
+++ b/frontend/src/app/homepage/homepage/homepage.component.ts
@@ -12,6 +12,8 @@ export class HomepageComponent {
   private keycloakService: KeycloakService = inject(KeycloakService);
 
   logout() {
-    this.keycloakService.logout();
+    const baseUrl = window.location.origin;
+
+    this.keycloakService.logout(`${baseUrl}/`);
   }
 }
diff --git a/frontend/src/app/landing-page/landing-page.component.ts b/frontend/src/app/landing-page/landing-page.component.ts
index ff25911..f7509cf 100644
--- a/frontend/src/app/landing-page/landing-page.component.ts
+++ b/frontend/src/app/landing-page/landing-page.component.ts
@@ -11,6 +11,8 @@ export class LandingPageComponent {
   private keycloakService: KeycloakService = inject(KeycloakService);
 
   login() {
-    this.keycloakService.login();
+    const baseUrl = window.location.origin;
+
+    this.keycloakService.login({ redirectUri: `${baseUrl}/home` });
   }
 }