diff --git a/src/main/java/de/hsel/itech/jsf/UserBean.java b/src/main/java/de/hsel/itech/jsf/UserBean.java
index 203a2f1..a0446cf 100644
--- a/src/main/java/de/hsel/itech/jsf/UserBean.java
+++ b/src/main/java/de/hsel/itech/jsf/UserBean.java
@@ -33,7 +33,6 @@ public class UserBean {
     @Getter
     private boolean error = false;
 
-
     public String login() {
         Database db = Database.getInstance();
         User user = db.user().get(username);
@@ -56,6 +55,7 @@ public class UserBean {
 
     public String logout() {
         user = null;
+        loggedIn = false;
         return "index.html";
     }
 
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 0d3f8f2..13107e8 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -47,7 +47,13 @@
                                     <ol>
                                         <li><a href="orders.xhtml">Meine Bestellungen</a></li>
                                         <li><a href="">Adressen und Konten</a></li>
-                                        <li><a href="logout.xhtml">Abmelden</a></li>
+                                        <h:form>
+                                            <h:commandLink action="#{userBean.logout}">Abmelden</h:commandLink>
+                                            <ui:remove>
+                                                <li><a href="logout.xhtml">Abmelden</a></li>
+                                            </ui:remove>
+                                        </h:form>
+
                                     </ol>
                                 </li>
                             </ol>