diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
index 0374ebdf..d987f769 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js
@@ -8,17 +8,11 @@ const guard = (to, from, next) => {
     if (store.state.loading) {
         next(false);
     } else if (store.state.loggedIn) {
-        next();
-    } else {
-        next({ name: 'login' });
-    }
-};
-
-const guardTeamer = (to, from, next) => {
-    if (store.state.loading) {
-        next(false);
-    } else if (store.state.loggedIn && store.state.teamer) {
-        next();
+        if (to.meta.requiresTeamer && !store.state.teamer) {
+            next(false);
+        } else {
+            next();
+        }
     } else {
         next({ name: 'login' });
     }
@@ -66,7 +60,8 @@ export default new VueRouter({
             name: 'teamer',
             path: '/teamer',
             component: Teamer,
-            beforeEnter: guardTeamer
+            meta: { requiresTeamer: true },
+            beforeEnter: guard
         },
         {
             path: '*',