diff --git a/bin/usermanager.js b/bin/usermanager.js
index 7514bcd..cf581c8 100644
--- a/bin/usermanager.js
+++ b/bin/usermanager.js
@@ -185,11 +185,14 @@ const updateUser = async () => {
 				user.password = User.HashPassword(value, user.salt);				
 				continue;
 			}
-
-			user[key] = value;
+			if (key === "email")
+				user[key] = value.toLowerCase();
+			else
+				user[key] = value;
 		}
 		user.save();
 		console.log(answers);
+		mainREPL();
 	});
 }
 
@@ -279,10 +282,10 @@ Passwort    : ${initialPassword}
 		const newUser         = User.build({
 			firstname,
 			lastname,
-			email,
+			email     : email.toLowerCase(),
 			nickname,
-			salt     : salt,
-			password : User.HashPassword(initialPassword, salt),
+			salt      : salt,
+			password  : User.HashPassword(initialPassword, salt),
 			role
 		});
 		
diff --git a/package.json b/package.json
index adb0600..38ebd2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mdos-web",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "description": "The frontend of MDoS exposed to the world - includes user, rights and access management",
   "main": "main.js",
   "scripts": {
diff --git a/public/assets/icon_logout.svg b/public/assets/icon_logout.svg
new file mode 100644
index 0000000..2723039
--- /dev/null
+++ b/public/assets/icon_logout.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
\ No newline at end of file
diff --git a/public/css/_header.scss b/public/css/_header.scss
index 22b90c2..4f3c48f 100644
--- a/public/css/_header.scss
+++ b/public/css/_header.scss
@@ -9,4 +9,13 @@ header {
 	img {
 		max-width: 4rem;
 	}
+}
+
+.version {
+	position: absolute;
+	top: 0.5rem;
+	left: 0.5rem;
+	font-size: 0.5rem;
+	color: #555;
+	z-index: 1000;
 }
\ No newline at end of file
diff --git a/public/css/_icons.scss b/public/css/_icons.scss
new file mode 100644
index 0000000..8e649bf
--- /dev/null
+++ b/public/css/_icons.scss
@@ -0,0 +1,7 @@
+h1 svg {
+	color: $blue;
+	margin-left: 1rem;
+	font-size: 1.2rem;
+	vertical-align: middle;
+	cursor: pointer;
+}
\ No newline at end of file
diff --git a/public/css/mdos.scss b/public/css/mdos.scss
index 06ec575..ee531c3 100644
--- a/public/css/mdos.scss
+++ b/public/css/mdos.scss
@@ -7,6 +7,7 @@
 @import "footer";
 @import "alert";
 @import "spinner";
+@import "icons";
 
 * {
 	box-sizing: border-box;
diff --git a/public/index.html b/public/index.html
index 4e45d10..9330159 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 	<title>MDoS</title>
-	<link rel=stylesheet type=text/css href=css/mdos.css />
+	<link rel=stylesheet type=text/css href=/css/mdos.css />
 	<meta name=viewport content="width=device-width, initial-scale=1.0, user-scalable=no" />
 	<meta name="apple-mobile-web-app-title" content="MDoS" />
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-	<link rel="apple-touch-icon" sizes="120x120" href="assets/appIcon@120.png" />
-	<link rel="apple-touch-icon" sizes="152x152" href="assets/appIcon@152.png" />
-	<link rel="apple-touch-icon" sizes="167x167" href="assets/appIcon@167.png" />
-	<link rel="apple-touch-icon" sizes="180x180" href="assets/appIcon@180.png" />
-	<link rel="apple-touch-icon" sizes="1024x1024" href="assets/appIcon@1024.png" />
-	<script type=module src=javascript/mdos.min.js></script>
+	<link rel="apple-touch-icon" sizes="120x120" href="/assets/appIcon@120.png" />
+	<link rel="apple-touch-icon" sizes="152x152" href="/assets/appIcon@152.png" />
+	<link rel="apple-touch-icon" sizes="167x167" href="/assets/appIcon@167.png" />
+	<link rel="apple-touch-icon" sizes="180x180" href="/assets/appIcon@180.png" />
+	<link rel="apple-touch-icon" sizes="1024x1024" href="/assets/appIcon@1024.png" />
+	<script type=module src=/javascript/mdos.min.js></script>
 </head>
 <body>
-
-<section class="view" id=view_login>
+<span class=version>Version 0.0.0-dev</span>
+<section class="view" data-view=login id=view_login data-default="1">
 	<header>
-		<img src=assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
+		<img src=/assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
 		<p>
 			Maschinendeck Trier e.V.
 		</p>
@@ -27,19 +27,25 @@ <h1>Türsystem</h1>
 	<main id=login>
 		<form id="loginForm" method="POST">
 			<input type=text name=username id=username placeholder=E-Mail />
-			<input type=password name=password id=password placeholder=Password />
+			<input type=password name=password id=password placeholder=Password autocomplete="off" />
 			<button class=blue id=loginButton>Login</button>
-			<a href="#forgotPassword">Passwort vergessen?</a>
+			<a href="/forgotPassword">Passwort vergessen?</a>
 		</form>
 	</main>
 </section>
-<section class="view" id=view_menu>
+<section class="view" data-view=menu id=view_menu>
 	<header>
-		<img src=assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
+		<img src=/assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
 		<p>
 			Maschinendeck Trier e.V.
 		</p>
-		<h1>Türsystem</h1>
+		<h1>
+			Türsystem
+			<svg id="logoutButton" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
+				<path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z"/>
+			<path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z"/>
+			</svg>
+		</h1>
 	</header>
 	<main>
 		<button id=open class=green>öffnen</button>
@@ -48,7 +54,7 @@ <h1>Türsystem</h1>
 	</main>
 </section>
 
-<section class="view" id=view_keypad style="z-index: 250;">
+<section class="view" data-view="keypad" id=view_keypad style="z-index: 250;">
 	<header>
 		<input type=text name=pin id=display maxlength="4" value="" pattern="[0-9]{4}" readonly/>
 	</header>
@@ -74,9 +80,9 @@ <h1>Türsystem</h1>
 	</main>
 </section>
 
-<section class="view" id=view_forgotPassword>
+<section class="view" data-view=forgotPassword id=view_forgotPassword>
 	<header>
-		<img src=assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
+		<img src=/assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
 		<p>
 			Maschinendeck Trier e.V.
 		</p>
@@ -96,9 +102,9 @@ <h1>Türsystem</h1>
 	</main>
 </section>
 
-<section class="view" id=view_changePassword>
+<section class="view" data-view=changePassword id=view_changePassword>
 	<header>
-		<img src=assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
+		<img src=/assets/logo_maschinendeck.svg alt="Logo des Maschinendeck Trier e.V." />
 		<p>
 			Maschinendeck Trier e.V.
 		</p>
@@ -112,12 +118,15 @@ <h1>Türsystem</h1>
 			</span>
 		</p>
 		<form id="changePasswordForm" method="POST">
-			<input type=password name=chPassword id=chPassword placeholder=Passwort />
-			<input type=password name=chPasswordConfirm id=chPasswordConfirm placeholder="Passwort widerholen" />
+			<input type=password name=chPassword id=chPassword placeholder=Passwort autocomplete="off" />
+			<input type=password name=chPasswordConfirm id=chPasswordConfirm placeholder="Passwort widerholen" autocomplete="off" />
 			<button class=blue id=chSendButton>Passwort ändern</button>
 		</form>
 	</main>
 </section>
+<section class=view data-view=notfound>
+	<h2>404 Seite nicht gefunden</h2>
+</section>
 
 <footer>
 
diff --git a/public/javascript/Keypad.js b/public/javascript/Keypad.js
index f673537..1d6974f 100644
--- a/public/javascript/Keypad.js
+++ b/public/javascript/Keypad.js
@@ -1,6 +1,7 @@
 import {$}     from "./Q6.js";
 import APICall from "./APICall.js";
 import Alert   from "./Alert.js";
+import {Visit} from "./Router.js";
 class Keypad {
 	constructor(navigator) {
 		this.navigator = navigator;
@@ -85,7 +86,8 @@ class Keypad {
 				case 200:
 					new Alert(Alert.Type.Success, "Der Code war korrekt. Die Tür wird geöffnet.");
 					this.clearDisplay();
-					this.navigator.changeView(this.navigator.views.menu);
+					//this.navigator.changeView(this.navigator.views.menu);
+					Visit("/menu");
 					break;
 				case 405:
 					new Alert(Alert.Type.ERROR, `Dir fehlt die Berechtigung diese Aktion durchzuführen`);
@@ -94,7 +96,8 @@ class Keypad {
 				case 508:
 					new Alert(Alert.Type.ERROR, "Der angegebene Code war inkorrekt.");
 					this.clearDisplay();
-					this.navigator.changeView(this.navigator.views.menu);
+					//this.navigator.changeView(this.navigator.views.menu);
+					Visit("/menu");
 					return;
 				default:
 					new Alert(Alert.Type.ERROR, `Etwas ist schiefgelaufen [Code ${response.code}]`);
diff --git a/public/javascript/Login.js b/public/javascript/Login.js
index 72d9e99..1058c1e 100644
--- a/public/javascript/Login.js
+++ b/public/javascript/Login.js
@@ -1,16 +1,27 @@
 import {$}     from "./Q6.js";
 import APICall from "./APICall.js";
+import {Visit} from "./Router.js";
+import Alert   from "./Alert.js";
 
-const Login = (navigator, jwt, setJWT) => {
+const Login = (router, jwt, setJWT) => {
 
 	const container         = $("#login");
 	const usernameContainer = $("#username");
 	const passwordContainer = $("#password");
+	const logoutButton      = $("#logoutButton");
 	const form              = $("#loginForm");
 
+	logoutButton.on("click", () => {
+		setJWT(null);
+		Visit("login");
+	});
+
 	if (jwt) {
 		APICall.JWT = jwt;
-		navigator.login();
+		if (router.path.length < 1) {
+			Visit("/menu");
+			console.log("loggedin");
+		}
 	}
 
 	const login = () => {
@@ -35,9 +46,10 @@ const Login = (navigator, jwt, setJWT) => {
 			}
 			setJWT(response.data.jwt);
 			APICall.JWT = response.data.jwt;
-			navigator.changeView(navigator.views.menu);
+			Visit("/menu");
 			passwordContainer.val("");
 		}).catch(error => {
+			new Alert(Alert.Type.ERROR, "Es besteht ein Problem mit der Kommunikation zum Login-Endpunkt.");
 			console.log("error", error);
 		});
 	}
diff --git a/public/javascript/MDoS.js b/public/javascript/MDoS.js
index 707f4e6..ee49909 100644
--- a/public/javascript/MDoS.js
+++ b/public/javascript/MDoS.js
@@ -1,20 +1,25 @@
 import useLocalStorage from "./hooks/useLocalStorage.js";
 
 import {$}           from "./Q6.js";
+import Router        from "./Router.js";
 import Navigator     from "./Navigator.js";
 import Keypad        from "./Keypad.js";
 import Login         from "./Login.js";
 import Password      from "./Password.js";
 import PasswordReset from "./PasswordReset.js";
 
+import {version} from "../../package.json";
+
 $(document).ready(() => {
+	$(".version").html(`Version ${version}`);
 	const [jwt, setJWT] = useLocalStorage("jwt", null);
 
+	const router    = new Router();
 	const navigator = new Navigator(jwt, setJWT);
-	Login(navigator, jwt, setJWT);
+	Login(router, jwt, setJWT);
 	new Keypad(navigator);
 	new Password();
-	new PasswordReset(navigator);
+	new PasswordReset();
 }).on("touchmove", (_, event) => {
 	event.preventDefault();
 });
\ No newline at end of file
diff --git a/public/javascript/Navigator.js b/public/javascript/Navigator.js
index 34d271b..96bda68 100644
--- a/public/javascript/Navigator.js
+++ b/public/javascript/Navigator.js
@@ -1,6 +1,7 @@
 import {$}     from "./Q6.js";
 import APICall from "./APICall.js";
 import Alert   from "./Alert.js";
+import {Visit} from "./Router.js";
 
 class Navigator {
 	constructor(jwt, setJWT) {
@@ -12,16 +13,8 @@ class Navigator {
 			restart : $("#restart"),
 			abort   : $("#abort")
 		};
-		this.views = {
-			login          : $("#view_login"),
-			menu           : $("#view_menu"),
-			keypad         : $("#view_keypad"),
-			forgotPassword : $("#view_forgotPassword"),
-			changePassword : $("#view_changePassword")
-		};
-
 		this.buttons.abort.on("click", () => {
-			this.changeView(this.views.menu);
+			Visit("/menu");
 		});
 		this.buttons.open.on("click", () => {
 			APICall.get("/door/request").then(response => {
@@ -29,18 +22,19 @@ class Navigator {
 					case 200:
 						break;
 					case 401:
-						this.changeView(this.views.login);
+						Visit("/login");
 						break;
 					case 430:
 						new Alert(Alert.Type.ERROR, "Timeout während des Vorgangs");
-						this.changeView(this.views.menu);
+						Visit("/menu");
 						break;
 					default:
 						new Alert(Alert.Type.ERROR, `Fehler beim Anfordern des Türcodes: ${response.message} [${response.code}]`);
+						Visit("/menu");
 						break;
 				}
 			});
-			this.changeView(this.views.keypad);
+			Visit("/keypad");
 		});
 
 		this.buttons.close.on("click", () => {
@@ -50,37 +44,6 @@ class Navigator {
 		this.buttons.restart.on("click", () => {
 			this.restartSystem();
 		});
-
-		window.onpopstate = event => {
-			const {hash} = event.currentTarget.location;
-
-			this.processAnchor(hash);
-		}
-
-		this.processAnchor();
-	}
-
-	login() {
-		const anchor = Navigator.Anchor();
-
-		if (!anchor)
-			this.changeView(this.views.menu);
-	}
-
-	processAnchor() {
-		const anchor = Navigator.Anchor();
-
-		switch(anchor) {
-			case "#forgotPassword":
-				this.changeView(this.views.forgotPassword);
-				break;
-			case "#changePassword":
-				this.changeView(this.views.changePassword);
-				break;
-			default:
-				this.changeView(this.views.login);
-				return;
-		}
 	}
 
 	closeDoor() {
@@ -126,25 +89,10 @@ class Navigator {
 		});
 	}
 
-	changeView(toView) {
-		for (const view of Object.values(this.views)) {
-			if (view !== toView)
-				view.removeClass("active");
-		}
-
-		toView.addClass("active");
-	}
-
 	deauthorize() {
 		this.setJWT(null);
 		APICall.JWT = null;
-		this.changeView(this.views.login);
-	}
-
-	static Anchor() {
-		const anchor = document.URL.split("#");
-
-		return anchor.length > 1 ? `#${anchor[anchor.length - 1]}` : null;
+		Visit("/login");
 	}
 }
 
diff --git a/public/javascript/Password.js b/public/javascript/Password.js
index c12f49f..bac3341 100644
--- a/public/javascript/Password.js
+++ b/public/javascript/Password.js
@@ -1,6 +1,7 @@
 import {$}     from "./Q6.js";
 import APICall from "./APICall.js";
 import Alert   from "./Alert.js";
+import {Visit} from "./Router.js";
 
 class Password {
 	constructor() {
@@ -27,6 +28,7 @@ class Password {
 					mit den Instruktionen zum Zurücksetzen deines Passworts gesendet.
 				`);
 				this.input.val("");
+				Visit("/login");
 			}
 		}).catch(error => {
 			new Alert(Alert.Type.ERROR, `Es ist ein Fehler aufgetreten: ${error.message}`);
diff --git a/public/javascript/PasswordReset.js b/public/javascript/PasswordReset.js
index edf0242..9bdf51f 100644
--- a/public/javascript/PasswordReset.js
+++ b/public/javascript/PasswordReset.js
@@ -1,16 +1,16 @@
-import {$}     from "./Q6.js";
-import APICall from "./APICall.js";
-import Alert   from "./Alert.js";
+import {$}             from "./Q6.js";
+import APICall         from "./APICall.js";
+import Alert           from "./Alert.js";
+import {Params, Visit} from "./Router.js";
 
 class PasswordReset {
-	constructor(navigator) {
-		this.navigator    = navigator;
+	constructor() {
 		this.input        = $("#chPassword");
 		this.inputConfirm = $("#chPasswordConfirm");
 		this.form         = $("#changePasswordForm");
 		this.button       = $("#chSendButton");
 	
-		const {key} = Object.fromEntries(new URLSearchParams(window.location.search).entries());
+		const {key} = Params;
 		this.key    = typeof key === "undefined" ? null : key;
 
 		this.form.on("submit", (_, event) => this.send(event));
@@ -43,7 +43,7 @@ class PasswordReset {
 		}).then(response => {
 			if (response.code === 200) {
 				new Alert(Alert.Type.SUCCESS, "Dein Passwort wurde erfolgreich geändert.");
-				this.navigator.changeView(this.navigator.views.login);
+				Visit("/login");
 			} else
 				new Alert(Alert.Type.ERROR, `Fehler beim Ändern des Passworts: ${response.message}`);
 		}).catch(error => {
diff --git a/public/javascript/Q6.js b/public/javascript/Q6.js
index efd54c8..07ab6be 100644
--- a/public/javascript/Q6.js
+++ b/public/javascript/Q6.js
@@ -68,14 +68,14 @@ class Q6 {
 		return this;
 	}
 
-	css(key, value = null) {
+	/*css(key, value = null) {
 		if (value === null)
 			return this._elements.style[Q6.TranslateCSSKey(key)];
 
 		this._each(element => {
 			element.style[Q6.TranslateCSSKey(key)] = value;
 		});
-	}
+	}*/
 
 	each(callback) {
 		for (let element of this._elements)
@@ -84,9 +84,9 @@ class Q6 {
 		return this;
 	}
 
-	find(selector) {
+	/*find(selector) {
 		return new Q6(selector, this._elements[0]);
-	}
+	}*/
 
 	get(index = 0) {
 		return this._elements[index];
@@ -106,7 +106,7 @@ class Q6 {
 		return this;
 	}
 
-	length() {
+	/*length() {
 		return this._elements.length;
 	}
 
@@ -118,7 +118,7 @@ class Q6 {
 		});
 
 		return this;
-	}
+	}*/
 
 	on(eventName, callback) {
 		this._each(element => {
@@ -130,13 +130,13 @@ class Q6 {
 		return this;
 	}
 
-	prepend(newElement) {
+	/*prepend(newElement) {
 		this._each(element => {
 			element.parentNode.insertBefore(newElement, element);
 		});
 
 		return this;
-	}
+	}*/
 
 	remove() {
 		this._each(element => element.remove());
@@ -161,13 +161,13 @@ class Q6 {
 		return this.on("DOMContentLoaded", callback);
 	}
 
-	toggleClass(className) {
+	/*toggleClass(className) {
 		this._each(element => {
 			element.classList.toggle(className);
 		});
 
 		return this;
-	}
+	}*/
 
 	val(value = null) {
 		if (value === null)
@@ -190,7 +190,7 @@ class Q6 {
 		return element.content.firstChild;
 	}
 
-	static TranslateCSSKey(key) {
+	/*static TranslateCSSKey(key) {
 		if (key.indexOf('-') < 0)
 			return key;
 		key = key.split('-');
@@ -205,7 +205,7 @@ class Q6 {
 		});
 		request.open("GET", url);
 		request.send();
-	}
+	}*/
 }
 
 const $ = Q6.$;
diff --git a/public/javascript/Router.js b/public/javascript/Router.js
new file mode 100644
index 0000000..398d2e0
--- /dev/null
+++ b/public/javascript/Router.js
@@ -0,0 +1,71 @@
+import {$} from "./Q6.js";
+
+class Router {
+	constructor() {
+		this.start = null;
+		this.views = {};
+		this.path  = Router.Path(window.location.pathname);
+
+		$(".view").each(element => {
+			if(element.data("default"))
+				this.views.default = element;
+			this.views[element.data("view")] = element;
+		});
+
+		$("a").each(element => {
+			element.click((link, event) => {
+				event.preventDefault();
+				Router.Visit(link.attr("href"));
+			});
+		});
+
+		$(window).on("historyChange", (_, event) => {
+			this.path = Router.Path(event.newPath);
+			this.route();
+		});
+
+		this.route();
+	}
+
+	route() {
+		if (this.path.length < 1) {
+			this.changeView(this.views.default);
+			return;
+		}
+
+		const view = this.path.shift();
+
+		if (Object.keys(this.views).includes(view))
+			this.changeView(this.views[view]);
+		else
+			this.changeView(this.views.notfound);
+	}
+
+	changeView(toView) {
+		for (const view of Object.values(this.views)) {
+			if (view !== toView)
+				view.removeClass("active");
+		}
+
+		toView.addClass("active");
+	}
+
+	static Path(path) {
+		return path.split("/").filter(element => element !== "");
+	}
+
+	static get Params() {
+		return Object.fromEntries(new URLSearchParams(window.location.search).entries());
+	}
+
+	static Visit(path) {
+		window.history.pushState({}, "", new URL(path, window.location.origin));
+		const event   = new Event("historyChange");
+		event.newPath = path;
+		window.dispatchEvent(event);
+	}
+}
+
+export const Visit  = Router.Visit;
+export const Params = Router.Params
+export default Router;
\ No newline at end of file
diff --git a/src/MDoS.js b/src/MDoS.js
index 94bfd49..451a027 100644
--- a/src/MDoS.js
+++ b/src/MDoS.js
@@ -5,9 +5,10 @@ const {Router}   = Express;
 
 const Secret            = require("./Models/Secret");
 const Response          = require("./Response");
-const {Log, LogLevel}   = require("./Std");
+const Std               = require("./Std");
 const Serial            = require("./Serial");
 const {ErrorMiddleware} = Response;
+const {Log, LogLevel}   = Std;
 
 const Auth          = require("./routes/Auth");
 const Door          = require("./routes/Door");
@@ -55,16 +56,21 @@ class MDoS {
 			]
 		}));
 		// activate when ready state is working correctly
-		this.app.use("/api", (request, response, next) => {
-			if (this.serial.ready()) {
-				next();
-				return;
-			}
-			response.json(new MDoSNotReadyError(request.path));
-		});
+		if (!Std.IsDevelopment()) {
+			this.app.use("/api", (request, response, next) => {
+				if (this.serial.ready()) {
+					next();
+					return;
+				}
+				response.json(new MDoSNotReadyError(request.path));
+			});
+		}
 		this.app.use("/api", this.router);
 		this.app.use(ErrorMiddleware);
-		this.app.use(Express.static(`${__dirname}/../public`));
+
+		const staticDirectory = Express.static(`${__dirname}/../public`);
+		this.app.use(staticDirectory);
+		this.app.use("*", staticDirectory);
 	}
 
 	listen() {
diff --git a/src/Response.js b/src/Response.js
index 9b54701..c63aeeb 100644
--- a/src/Response.js
+++ b/src/Response.js
@@ -27,7 +27,7 @@ class Response {
 				message = "Authentication token invalid or missing";
 				break;
 			default:
-				code    = error.code;
+				code    = error.status;
 				message = error.message;
 				break;
 		}
diff --git a/src/routes/Auth.js b/src/routes/Auth.js
index e866c8d..8b488a6 100644
--- a/src/routes/Auth.js
+++ b/src/routes/Auth.js
@@ -14,6 +14,7 @@ class AuthenticationError extends Response {
 
 const Auth = async (request, response) => {
 	const {username, password} = request.body;
+	const email = username.toLowerCase();
 
 	if (!username || !password) {
 		response.json(new AuthenticationError());
@@ -22,11 +23,12 @@ const Auth = async (request, response) => {
 
 	const users = await User.findAll({
 		where : {
-			email : username
+			email
 		}
 	});
 
 	if (users.length !== 1) {
+		Log(`Unknown user '${username}' has tried to log in`, LogLevel.ERROR);
 		response.json(new AuthenticationError());
 		return;
 	}
diff --git a/src/routes/Password.js b/src/routes/Password.js
index 34c6050..a02e346 100644
--- a/src/routes/Password.js
+++ b/src/routes/Password.js
@@ -38,7 +38,7 @@ const Password = async (request, response) => {
 				Passwortreset angefordert wurde.
 			</p>
 			<p>
-				Um dein Passwort zu ändern, folge diesem <a href="https://${process.env.DOMAIN || ""}/?key=${key}#changePassword">Link</a>
+				Um dein Passwort zu ändern, folge diesem <a href="https://${process.env.DOMAIN || ""}/changePassword?key=${key}">Link</a>
 			</p>
 			<p>
 				Falls du diesen Reset nicht angefordert hast, kannst du diese E-Mail einfach ignorieren.
