diff --git a/src/components/Login/LoginForm.vue b/src/components/Login/LoginForm.vue
index 3b08c7d7c114206ad3b292cfc86c918beea7f670..9d943060edb1262d6bc3a01172952601969ce2c5 100644
--- a/src/components/Login/LoginForm.vue
+++ b/src/components/Login/LoginForm.vue
@@ -35,7 +35,7 @@ const handleSubmit = async () => {
     let response = await AuthenticationService.login({ requestBody: loginUserPayload });
 
     if (response.token == null || response.token == undefined) {
-      //errorBoxMsg.value = 'A valid token could not be created';
+      errorMsg.value = 'A valid token could not be created';
       return;
     }
 
diff --git a/src/router/index.ts b/src/router/index.ts
index d8c0f7c3507eac8e04a04905a94eaf0a559c836e..2fa8ce7d2fabe6bfc6d5015ab463388614daf364 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -11,6 +11,7 @@ const routes = [
     path: '/',
     name: 'base',
     component: () => import('@/views/BasePageView.vue'),
+    meta: { requiresAuth: true },
     children: [
       {
         path: '',
@@ -130,13 +131,22 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
   const requiresAuth = to.matched.some(record => record.meta.requiresAuth);
   const requiresAdmin = to.matched.some(record => record.meta.requiresAdmin);
-  const userRole = useUserInfoStore().role;
+  let user = useUserInfoStore();
+  const userRole = user.role;
+  const isAuthenticated = user.isLoggedIn;
 
-  if (requiresAdmin && userRole !== 'admin') {
-    next({ name: 'unauthorized' });
+  /*if (requiresAuth && !isAuthenticated) {
+    next({ name: 'login' });
   } else {
-    next();
-  }
+    if (requiresAdmin && userRole !== 'admin') {
+      next({ name: 'unauthorized' });
+    } else {
+      next();
+    }
+  }*/
+
+  next();
+
 });
 
 export default router;
\ No newline at end of file