diff --git a/src/main/java/org/s4s/dao/impl/LogoutControl.java b/src/main/java/org/s4s/dao/impl/LogoutControl.java
index 6e2135bccce791f876e71ff6a93a85ae0d6a7ec6..d19e710fa2553d676dc537fff089b1cfa35debad 100644
--- a/src/main/java/org/s4s/dao/impl/LogoutControl.java
+++ b/src/main/java/org/s4s/dao/impl/LogoutControl.java
@@ -5,20 +5,17 @@
  */
 package org.s4s.dao.impl;
 
+import com.vaadin.server.VaadinSession;
+import com.vaadin.ui.UI;
+
 /**
  *
  * @author Sebastian
  */
 public class LogoutControl {
     private void logout() {
-        // Close the VaadinServiceSession
-        getUI().getSession().close();
-
-        // Invalidate underlying session instead if login info is stored there
-        // VaadinService.getCurrentRequest().getWrappedSession().invalidate();
-
-        // Redirect to avoid keeping the removed UI open in the browser
-        getUI().getPage().setLocation(getLogoutPageLocation());
+        VaadinSession session = UI.getCurrent().getSession();
+        session.close();
     }
     
 }