diff --git a/frontend/src/components/BaseAlert.vue b/frontend/src/components/BaseAlert.vue
index a45139aa1..33567682d 100644
--- a/frontend/src/components/BaseAlert.vue
+++ b/frontend/src/components/BaseAlert.vue
@@ -40,6 +40,9 @@
     components: {
       FadeTransition
     },
+    created() {
+      console.log("base-alert gesetzt in =>", this.$route.path )
+    },
     props: {
       type: {
         type: String,
@@ -64,7 +67,9 @@
     },
     methods: {
       dismissAlert() {
+        console.log("sdddddddddddddddddddddddd")
         this.visible = false;
+        this.$store.state.loginfail = false;
       }
     }
   };
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 67b161292..fc9e5b71d 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -37,7 +37,6 @@ import 'vue-good-table/dist/vue-good-table.css';
 
 import VueMoment from 'vue-moment';
 
-import CountryFlag from 'vue-country-flag'
 
 
 Object.keys(rules).forEach(rule => {
@@ -59,7 +58,6 @@ export default {
     Vue.use(VueQrcodeReader);
     Vue.use(VueQrcode);
     Vue.use(VueFlatPickr);
-    Vue.use(CountryFlag);
     configure({
       classes: {
         valid: 'is-valid',
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index e53dcedb6..cc3714fd5 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -12,6 +12,7 @@ export const store = new Vuex.Store({
     language: 'en',
     sizeDE: 'normal',
     sizeGB: 'big',
+    loginfail: false,
     user : {
       name:"",
       balance: 0,
@@ -55,6 +56,10 @@ export const store = new Vuex.Store({
       }
 
     },
+    loginfail: (state, loginfail) => {
+      //console.log('mutation: email')
+      state.loginfail = loginfail
+    },
     email: (state, email) => {
       //console.log('mutation: email')
       state.email = email
@@ -88,11 +93,13 @@ export const store = new Vuex.Store({
         router.push('/overview')
       } else {
         // Register failed, we perform a logout
-        // console.log('action login to  logout start')
-        dispatch('logout')
+         //alert('>>>>> FAIl LOGIN') 
+         commit('loginfail', true)
+         
+        //dispatch('logout')
       }
       //}, (error) => {
-      //  console.log(error);
+        //console.log(error);
       //});
     },
     passwordReset: async (data) => {
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 393a1ca61..7ae741057 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -12,7 +12,6 @@
           </b-row>
         </div>
       </b-container>
-     
     </div>
     <!-- Page content -->
     <b-container class="mt--8 pb-5">
@@ -20,12 +19,11 @@
         <b-col lg="5" md="7">
           <b-card no-body class="border-0 mb-0" style="background-color: #ebebeba3 !important;">
             <b-card-body class="px-lg-5 py-lg-5">
-              
                 <div class="text-center text-muted mb-4">
                 <small>{{ $t('login')}}</small>
               </div>
                <validation-observer v-slot="{handleSubmit}" ref="formValidator">
-                <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
+                <b-form role="form" @submit.prevent="handleSubmit(onSubmit)"  >
                   <base-input alternative
                               class="mb-3"
                               name="Email"
@@ -45,6 +43,27 @@
                               v-model="model.password">
                   </base-input>
 
+
+                  <b-alert v-show="$store.state.loginfail" show variant="warning" >
+                     
+                        <span class="alert-text bv-example-row">
+                                <b-row>
+                                    <b-col class="col-9 text-left">
+                                      <strong>Leider konnten wir keinen Account finden mit diesen Daten!</strong>
+                                    </b-col>
+                                    <b-col class="text-right" >
+                                      <a href="#!" @click="closeAlert"> 
+                                       <div>
+    
+                                          <b-icon-exclamation-triangle-fill class="h2 mb-0"></b-icon-exclamation-triangle-fill>
+                                          <b-icon-x class="h1 pl-2"></b-icon-x>
+                                        </div>
+                                      </a>
+                                    </b-col>
+                                </b-row>
+                              </span>
+                  </b-alert>
+
                   <!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
                   <div class="text-center">
                     <base-button type="secondary" native-type="submit" class="my-4">{{ $t('site.login.signin')}}</base-button>
@@ -67,6 +86,7 @@
   </div>
 </template>
 <script>
+
   export default {
     name: "login",
     data() {
@@ -81,6 +101,9 @@
     methods: {    
       onSubmit() {
         this.$store.dispatch('login', {"email":  this.model.email, "password":  this.model.password})
+      },
+      closeAlert(){
+        this.$store.state.loginfail = false
       }
     }
   }