diff --git a/src/stores/notifications.ts b/src/stores/notifications.ts
index f14c64b..9fc0bf0 100644
--- a/src/stores/notifications.ts
+++ b/src/stores/notifications.ts
@@ -14,7 +14,7 @@ export const useNotifications = defineStore('notifications', {
             this.notifications.delete(id)
         },
 
-        add(type : string, text: string) : void {
+        add(type : string, text: string, timeout: number = 1000) : void {
             const id = uuidv4()
             this.notifications.set(
                 id, 
@@ -23,7 +23,7 @@ export const useNotifications = defineStore('notifications', {
                     text:text,
                 }
             )
-            setTimeout(() => this.remove(id), 1500)
+            if (timeout !== -1) setTimeout(() => this.remove(id), timeout)
         }
     }
 })
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 293aff5..5d31acf 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -5,23 +5,11 @@ import { AxiosError } from 'axios'
 import axios from 'axios'
 
 type AuthSuccResult = {
-	notification: {
-		type: string,
-		text: string
-	}
 	user: string,
 	role: string,
     token: string
 }
 
-type AuthErrResult = {
-	notification: {
-		text: string,
-		type: string
-	}
-}
-
-
 
 export const useUser = defineStore({
     id: 'storeUser',
@@ -38,16 +26,14 @@ export const useUser = defineStore({
 
     getters: {
         isAdmin: (state) => state.role === 'admin',
-
-        preferredStorage: (state) => {
-            return localStorage
-            /* if (state.rememberMe) return localStorage
-            else return sessionStorage */
-        }
     },
 
     actions: {
-        async login(username: string, password: string): Promise<boolean> {
+        async login(username: string, password: string): Promise<
+            boolean | 
+            'E_INVALID_AUTH_PASSWORD: Password mis-match' |
+            'E_INVALID_AUTH_UID: User not found'
+        > {
         
             const notifications = useNotifications()
 
@@ -64,18 +50,26 @@ export const useUser = defineStore({
                 this.role = response.data.role
                 this.token = response.data.token
 
-                notifications.add(response.data.notification.type, response.data.notification.text)
+                notifications.add('success', 'Login successful.')
 
                 return true
             } catch(err : unknown) {              
                 if (axios.isAxiosError(err) && err.response && err.response.data){  
 
-                    const data = err.response.data as AuthErrResult
-
-                    notifications.add(data.notification.type, data.notification.text)
+                    const data = err.response.data
 
+                    if(
+                        data === 'E_INVALID_AUTH_PASSWORD: Password mis-match' ||
+                        data === 'E_INVALID_AUTH_UID: User not found'
+                    ) return data
                 }
 
+                else if(err instanceof Error){
+                    notifications.add('danger', err.message, -1)
+                    return false
+                }
+
+                notifications.add('danger', err as string, -1)
                 return false
             }
             
@@ -105,7 +99,7 @@ export const useUser = defineStore({
             catch(error) {
                 if(error instanceof Error) {
 
-                   notifications.add('danger', error.message)
+                   notifications.add('danger', error.message, -1)
                 }   
                 return false
             }
diff --git a/src/views/Login.vue b/src/views/Login.vue
index d8e5fa3..abff9ab 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,29 +1,36 @@
 <template>
     <img src="/src/assets/logo.png">
-    <form class="m-auto needs-validation" novalidate>
+    <form class="m-auto" novalidate>
         <h1 class="h3 mb-4">Bitte einloggen</h1>
         <div class="form-floating">
             <input 
                 type="text" 
                 class="form-control" 
+                :class="validation.username"
                 id="usernameInput" 
                 v-model="input.username" 
                 placeholder="Benutzername" 
-                required
+                aria-labeledby="username-feedback"
             >
-
-            <label for="usernameInput">Benutzername</label>
+            <label id="username-feedback" for="usernameInput">Benutzername</label>
+             <div class="invalid-feedback">
+                {{valMessages.username}}
+            </div>
         </div>
         <div class="form-floating mb-4">
             <input 
                 type="password" 
                 class="form-control" 
+                :class="validation.password"
                 id="passwordInput" 
                 v-model="input.password" 
                 placeholder="Passwort"
-                required
+                aria-describedby="passwordFeedback"
             >
             <label for="passwordInput">Passwort</label>
+            <div id="passwordFeedback" class="invalid-feedback">
+                {{valMessages.password}}
+            </div>
         </div>
 
         <button 
@@ -38,25 +45,83 @@
 
 <script setup lang="ts">
 import { useUser } from '@/stores/user'
-import { reactive } from 'vue'
+import { truncate } from 'fs/promises'
+import { reactive, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 const userStore = useUser()
-
 const router = useRouter()
 
+const validation = reactive({
+    failure: false,
+    username: {
+        'is-invalid': false,
+    },
+    password: {
+        'is-invalid': false
+    }
+})
+
+const valMessages = reactive({
+    username: '',
+    password: ''
+})
+
 const input = reactive({
     username: '',
     password: '',
 })
 
+watch(() => input.username, (username) => {
+    if(username.length > 0) validation.username['is-invalid'] = false
+})
+watch(() => input.password, (password) => {
+    if(password.length > 0) validation.password['is-invalid'] = false
+})
+
 async function onClick() {
-    /**TODO #20 Use sessionStorage or localStorage based on rememberMe! */
-    if(await userStore.login(input.username, input.password)) {
-        router.push({name: 'Home'})
-    }
+    resetFailureState()
     
+    if(input.username === '') {
+        validation.username['is-invalid'] = true
+        valMessages.username = 'Benutzername kann nicht leer sein.'
+        validation.failure = true
+    }
+    if(input.password === ''){
+        validation.password['is-invalid'] = true
+        valMessages.password = 'Passwort kann nicht leer sein'
+        validation.failure = true
+    }
+
+    if(validation.failure) return
+
+    const result = await userStore.login(input.username, input.password)
+
+    switch(result) {
+        case true:
+            router.push({name: 'Home'})
+            break;
+        case 'E_INVALID_AUTH_PASSWORD: Password mis-match':
+            validation.password['is-invalid'] = true
+            valMessages.password = 'Passwort falsch.'
+            break;
+        case 'E_INVALID_AUTH_UID: User not found':
+            validation.username['is-invalid'] = true
+            valMessages.username = 'Benutzer nicht gefunden'
+            break;
+    }
+
 }
+
+const resetFailureState = () => {
+    validation.failure = false
+    validation.password['is-invalid'] = false
+    validation.username['is-invalid'] = false
+    valMessages.password = ''
+    valMessages.username = ''
+}
+
+
     
 </script>