diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index b09b445..585ae8c 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -115,11 +115,9 @@ const router = async(uri) => {
 
     const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin);
 
-	if (await client.isAuthenticated() === false && !(view instanceof AuthenticationView))
+	if (!(view instanceof AuthenticationView) && ! (view instanceof LogoutView))
 		lastPageUrlBeforeLogin = uri;
 
-    console.log(lastPageUrlBeforeLogin)
-
     if (view instanceof AbstractRedirectView && await view.redirect())
         return 1;
 
diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index cf5341f..edd59fc 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title) {
-		super(params, title, "/login");
+    constructor(params, title, uri = "/home") {
+		super(params, title, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
index d70df04..c4936d2 100644
--- a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title, url) {
-		super(params, title, url);
+    constructor(params, title, uri = "/home") {
+		super(params, title, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractRedirectView.js b/frontend/static/js/views/abstracts/AbstractRedirectView.js
index 81f1936..713f3f3 100644
--- a/frontend/static/js/views/abstracts/AbstractRedirectView.js
+++ b/frontend/static/js/views/abstracts/AbstractRedirectView.js
@@ -2,14 +2,14 @@ import { navigateTo } from "../../index.js";
 import AbstractView from "./AbstractView.js";
 
 export default class extends AbstractView{
-    constructor(params, title, url)
+    constructor(params, title, uri)
     {
         super(params, title);
-        this.redirect_url = url;
+        this.redirect_url = uri;
     }
 
     async redirect()
     {
-        navigateTo(url);
+        navigateTo(this.redirect_url);
     }
 }
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 8b4737f..595934e 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -7,9 +7,7 @@ export default class extends AbstractNonAuthenticatedView
 {
 	constructor(params, lastUrlBeforeLogin = '/home')
 	{
-		
         super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
-		this.redirect_url = lastUrlBeforeLogin;
 		this.current_mode = undefined
 	}
 
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/frontend/static/js/views/accounts/LogoutView.js
index d5307f1..0f8b85e 100644
--- a/frontend/static/js/views/accounts/LogoutView.js
+++ b/frontend/static/js/views/accounts/LogoutView.js
@@ -4,7 +4,7 @@ import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js
 export default class extends AbstractAuthenticatedView
 {
 	constructor(params, lastPageUrl = '/login') {
-		super(params, lang.get('logoutWindowTitle', 'Logout'));
+		super(params, lang.get('logoutWindowTitle', 'Logout'), lastPageUrl);
 		this.lastPageUrl = lastPageUrl;
 	}