diff --git a/source/logic/main.ts b/source/logic/main.ts
index f9186e4..7ad3adf 100644
--- a/source/logic/main.ts
+++ b/source/logic/main.ts
@@ -59,11 +59,6 @@ function setup_nav(
 			"label": "Anmelden",
 			"classes": ["logged_out"],
 		},
-		{
-			"location": {"name": "logout", "parameters": {}},
-			"label": "Abmelden",
-			"classes": ["logged_in"],
-		},
 		{
 			"location": {"name": "list", "parameters": {}},
 			"label": "Liste",
@@ -74,6 +69,11 @@ function setup_nav(
 			"label": "Anlegen",
 			"classes": ["logged_in"],
 		},
+		{
+			"location": {"name": "logout", "parameters": {}},
+			"label": "Abmelden",
+			"classes": ["logged_in"],
+		},
 	];
 	
 	let dom_ul : HTMLElement = document.querySelector("nav > ul");
diff --git a/source/pages/login/logic.ts b/source/pages/login/logic.ts
index 232bc2f..7c08452 100644
--- a/source/pages/login/logic.ts
+++ b/source/pages/login/logic.ts
@@ -55,7 +55,7 @@ lib_plankton.zoo_page.register(
 							_espe.backend.login(value.name, value.password)
 							.then(
 								() => {
-									lib_plankton.zoo_page.set({"name": "index", "parameters": {}});
+									lib_plankton.zoo_page.set({"name": "list", "parameters": {}});
 									update_nav({"mode": "logged_in"});
 								}
 							)