diff --git a/Web/src/app/pages/authentication/callback/callback.component.html b/Web/src/app/pages/authentication/callback/callback.component.html
index 02eb282..e69de29 100755
--- a/Web/src/app/pages/authentication/callback/callback.component.html
+++ b/Web/src/app/pages/authentication/callback/callback.component.html
@@ -1,27 +0,0 @@
-<div class="blank-layout-container justify-content-center">
-  <div class="position-relative row w-100 h-100">
-    <div class="col-lg-8 col-xl-9 bg-gredient p-0">
-      <div class="p-24 h-100">
-        <app-branding></app-branding>
-
-        <div class="align-items-center justify-content-center img-height d-none d-lg-flex">
-          <img src="/assets/images/backgrounds/login-bg.svg" alt="login" style="max-width: 500px" />
-        </div>
-      </div>
-    </div>
-    <div class="col-lg-4 col-xl-3 p-0 d-flex justify-content-center">
-      <div class="p-32 d-flex align-items-start align-items-lg-center h-100 max-width-form justify-content-center">
-        <div>
-          <h4 class="f-w-700 f-s-20 m-0">Authentikácia úspešná!</h4>
-          @if(!profile) {
-          <span class="f-s-14 d-block f-s-14 m-t-24">Načítavam Vaše údaje...</span>
-          }
-          @else{
-          <span class="f-s-14 d-block f-s-14 m-t-24">{{profile.email}}</span>
-          <img [src]="profile.picture" alt="profile picture" width="100" class="m-t-16 rounded-circle" />
-          }
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/Web/src/app/pages/authentication/callback/callback.component.ts b/Web/src/app/pages/authentication/callback/callback.component.ts
index b3624bb..bdf99ff 100755
--- a/Web/src/app/pages/authentication/callback/callback.component.ts
+++ b/Web/src/app/pages/authentication/callback/callback.component.ts
@@ -2,13 +2,12 @@ import { Component } from '@angular/core';
 import { Router, RouterModule } from '@angular/router';
 import { CoreService } from '../../../services/core.service';
 import { MaterialModule } from '../../../material.module';
-import { BrandingComponent } from '../../../layouts/full/vertical/sidebar/branding.component';
 import { AuthenticationService } from '../../../services/authentication.service';
 import { NgScrollbarModule } from "ngx-scrollbar";
 
 @Component({
   selector: 'app-callback',
-  imports: [RouterModule, MaterialModule, BrandingComponent, NgScrollbarModule],
+  imports: [RouterModule, MaterialModule, NgScrollbarModule],
   templateUrl: './callback.component.html',
 })
 export class CallbackComponent {
diff --git a/Web/src/app/pages/authentication/side-logout/side-logout.component.html b/Web/src/app/pages/authentication/side-logout/side-logout.component.html
index 7ccd6d4..dfb7ecb 100644
--- a/Web/src/app/pages/authentication/side-logout/side-logout.component.html
+++ b/Web/src/app/pages/authentication/side-logout/side-logout.component.html
@@ -5,7 +5,7 @@
                 <app-branding></app-branding>
 
                 <div class="align-items-center justify-content-center img-height d-none d-lg-flex">
-                    <img src="/assets/images/backgrounds/login-bg.svg" alt="login" style="max-width: 500px" />
+                    <img src="/assets/images/backgrounds/login-bg.svg" alt="prihlásenie" style="max-width: 500px" />
                 </div>
             </div>
         </div>
@@ -13,14 +13,14 @@
             <div class="p-32 d-flex align-items-start align-items-lg-center justify-content-center h-100">
                 <div class="row justify-content-center w-100">
                     <div class="col-lg-9 max-width-form">
-                        <h4 class="f-w-700 f-s-24 m-0">Signed out</h4>
-                        <span class="f-s-14 d-block f-s-14 m-t-8">You have beens successfully logged out.</span>
+                        <h4 class="f-w-700 f-s-24 m-0">Odhlásenie</h4>
+                        <span class="f-s-14 d-block f-s-14 m-t-8">Úspešne ste sa odhlásili.</span>
 
                         <div class="row m-t-24 align-items-center">
                             <a [routerLink]="['/authentication/login']" mat-flat-button color="primary"
                                 class="w-100">
                                 <div class="d-flex align-items-center">
-                                    Prihlásenie
+                                    Prihlásiť sa
                                 </div>
                             </a>
 
diff --git a/Web/src/app/services/authentication.service.ts b/Web/src/app/services/authentication.service.ts
index a9be0c6..8bf4c06 100644
--- a/Web/src/app/services/authentication.service.ts
+++ b/Web/src/app/services/authentication.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
 
 const CONFIG_KEY = 'oauth_config_v1';
@@ -17,7 +18,7 @@ export class AuthenticationService {
 
     public profile: any = null;
 
-    constructor(private oauthService: OAuthService) { }
+    constructor(private oauthService: OAuthService, private router: Router) { }
 
     saveConfig(cfg: Partial<AuthConfig>) {
         try {
@@ -52,7 +53,7 @@ export class AuthenticationService {
     // Restore configuration from storage and apply to OAuthService
     restoreConfiguration(): boolean {
         const cfg = this.loadConfig() ?? this.config;
-        if (!cfg) return false;
+        if (!cfg.issuer) return false;
         this.oauthService.configure(cfg);
         return true;
     }
@@ -70,16 +71,18 @@ export class AuthenticationService {
 
     // Call this on the callback route to process the redirect and obtain tokens + profile
     handleCallback(): Promise<any> {
-        this.restoreConfiguration();
-        // Ensure discovery document loaded, then process code flow, then load profile
-        return this.oauthService
-            .loadDiscoveryDocumentAndTryLogin()
-            .then((isLoggedIn: boolean) => {
-                if (!isLoggedIn && !this.oauthService.hasValidAccessToken()) {
-                    return Promise.reject('No valid token after callback');
-                }
-                return this.loadUserProfile();
-            });
+        if (this.restoreConfiguration())
+            // Ensure discovery document loaded, then process code flow, then load profile
+            return this.oauthService
+                .loadDiscoveryDocumentAndTryLogin()
+                .then((isLoggedIn: boolean) => {
+                    if (!isLoggedIn && !this.oauthService.hasValidAccessToken()) {
+                        return Promise.reject('No valid token after callback');
+                    }
+                    return this.loadUserProfile();
+                });
+        else
+            return this.router.navigate(['/authentication/login']);
     }
 
     loadUserProfile(): Promise<any> {