diff --git a/static/templates/login.st b/static/templates/login.st
index 51f8311..fdec507 100644
--- a/static/templates/login.st
+++ b/static/templates/login.st
@@ -19,6 +19,5 @@
                 <button type="submit">Einloggen…</button>
             </fieldset>
         </form>
-        <a href="reset-pw«if(data.email)»?email=«data.email»«endif»">Forgot password?</a>
     </body>
 </html>
\ No newline at end of file
diff --git a/static/templates/navigation.st b/static/templates/navigation.st
index dd83bc8..ef93da6 100644
--- a/static/templates/navigation.st
+++ b/static/templates/navigation.st
@@ -1,7 +1,12 @@
 <nav>
-    «if(data.user)»<a class="button logout" href="logout" />Logout</a>«endif»
+    «if(data.user)»
+        <a class="button logout" href="logout" />Logout</a>
+    «endif»
     <a href="index">Home</a>
     <a href="admin">Administration</a>
+    «if(!data.user)»
+        <a class="button" href="reset-pw" />Passwort vergessen?</a>
+    «endif»
 
     <script type="text/javascript">
         if ('«data.user.permissions»'.includes('admin')){