diff --git a/frontend/src/api/api-utils.js b/frontend/src/api/api-utils.js
index 6fcba6b88..d3cb95228 100644
--- a/frontend/src/api/api-utils.js
+++ b/frontend/src/api/api-utils.js
@@ -1,7 +1,7 @@
 const baseURL = "/api/";
 import axios from "axios";
 import utils from "@/utils";
-import { store } from "../store/store";
+import { store } from "../store";
 
 axios.defaults.headers.common[
   "Authorization"
diff --git a/frontend/src/api/backup.js b/frontend/src/api/backup.js
index dd9d80b57..2b00d0d03 100644
--- a/frontend/src/api/backup.js
+++ b/frontend/src/api/backup.js
@@ -1,6 +1,6 @@
 import { baseURL } from "./api-utils";
 import { apiReq } from "./api-utils";
-import { store } from "../store/store";
+import { store } from "../store";
 
 const backupBase = baseURL + "backups/";
 
diff --git a/frontend/src/api/migration.js b/frontend/src/api/migration.js
index 5a4b40dc4..fc6310253 100644
--- a/frontend/src/api/migration.js
+++ b/frontend/src/api/migration.js
@@ -1,6 +1,6 @@
 import { baseURL } from "./api-utils";
 import { apiReq } from "./api-utils";
-import { store } from "../store/store";
+import { store } from "../store";
 
 const migrationBase = baseURL + "migrations";
 
diff --git a/frontend/src/api/recipe.js b/frontend/src/api/recipe.js
index dc2163ead..4a29762b4 100644
--- a/frontend/src/api/recipe.js
+++ b/frontend/src/api/recipe.js
@@ -1,6 +1,6 @@
 import { baseURL } from "./api-utils";
 import { apiReq } from "./api-utils";
-import { store } from "../store/store";
+import { store } from "../store";
 import { router } from "../main";
 import qs from "qs";
 
diff --git a/frontend/src/components/Login/LoginForm.vue b/frontend/src/components/Login/LoginForm.vue
index f840c5e4a..24017ddaa 100644
--- a/frontend/src/components/Login/LoginForm.vue
+++ b/frontend/src/components/Login/LoginForm.vue
@@ -32,6 +32,7 @@
             v-model="user.email"
             light="light"
             prepend-icon="mdi-email"
+            validate-on-blur
             :label="$t('login.email')"
             type="email"
           ></v-text-field>
diff --git a/frontend/src/main.js b/frontend/src/main.js
index d8040e6b2..a6092aca4 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import App from "./App.vue";
 import vuetify from "./plugins/vuetify";
-import store from "./store/store";
+import store from "./store";
 import VueRouter from "vue-router";
 import { routes } from "./routes";
 import i18n from "./i18n";
diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
index 60319b728..529cf87e4 100644
--- a/frontend/src/routes/index.js
+++ b/frontend/src/routes/index.js
@@ -11,7 +11,7 @@ import LoginPage from "../pages/LoginPage";
 import MealPlanThisWeekPage from "../pages/MealPlanThisWeekPage";
 import api from "@/api";
 import Admin from "./admin";
-import { store } from "../store/store";
+import { store } from "../store";
 
 export const routes = [
   { path: "/", name: "home", component: HomePage },
diff --git a/frontend/src/store/store.js b/frontend/src/store/index.js
similarity index 100%
rename from frontend/src/store/store.js
rename to frontend/src/store/index.js
diff --git a/frontend/src/utils.js b/frontend/src/utils/index.js
similarity index 98%
rename from frontend/src/utils.js
rename to frontend/src/utils/index.js
index ed62aabbc..b1d9460cd 100644
--- a/frontend/src/utils.js
+++ b/frontend/src/utils/index.js
@@ -1,7 +1,7 @@
 // import utils from "@/utils";
 // import Vue from "vue";
 // import Vuetify from "./plugins/vuetify";
-import { vueApp } from "./main";
+import { vueApp } from "../main";
 
 const notifyHelpers = {
   baseCSS: "notify-base",
diff --git a/frontend/src/utils/validators.js b/frontend/src/utils/validators.js
new file mode 100644
index 000000000..96dab710e
--- /dev/null
+++ b/frontend/src/utils/validators.js
@@ -0,0 +1,8 @@
+const validators = {
+  emailRules: v =>
+    !v ||
+    /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
+    "E-mail must be valid",
+};
+
+export { validators };