diff --git a/app/Handlers/Events/UserEventListener.php b/app/Handlers/Events/UserEventListener.php
new file mode 100644
index 0000000000..6bfdbb75bd
--- /dev/null
+++ b/app/Handlers/Events/UserEventListener.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * UserEventListener.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Handlers\Events;
+
+use Session;
+
+/**
+ * Class UserEventListener
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class UserEventListener
+{
+    /**
+     * Handle user logout events.
+     */
+    public function onUserLogout($event)
+    {
+        // dump stuff from the session:
+        Session::forget('twofactor-authenticated');
+        Session::forget('twofactor-authenticated-date');
+
+        return true;
+    }
+}
\ No newline at end of file