diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index bb925876b..42d1e5fb1 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -70,7 +70,6 @@
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
 import VueQrcode from 'vue-qrcode'
-import loginAPI from '../../apis/loginAPI'
 
 export default {
   name: 'sidebar',
@@ -102,10 +101,8 @@ export default {
     showSidebar() {
       this.$sidebar.displaySidebar(true)
     },
-    async logout() {
-      //const result = await loginAPI.logout(this.$store.state.session_id)
-      this.$store.dispatch('logout')
-      this.$router.push('/login')
+    logout() {
+      this.$emit('logout')
     },
   },
 }
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index cb6ea841a..82c2e6992 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
-import loginAPI from '../apis/loginAPI'
 import communityAPI from '../apis/communityAPI'
 import createPersistedState from 'vuex-persistedstate'
 
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index ec2fc1352..341f63ce3 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrapper">
     <notifications></notifications>
-    <side-bar>
+    <side-bar @logout="logout">
       <template slot="links">
         <b-nav-item href="#!" to="/overview">
           <b-nav-text class="p-0 text-lg text-muted">{{ $t('send') }}</b-nav-text>
@@ -36,6 +36,7 @@
 <script>
 import PerfectScrollbar from 'perfect-scrollbar'
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
+import loginAPI from '../../apis/loginAPI'
 
 function hasElement(className) {
   return document.getElementsByClassName(className).length > 0
@@ -71,6 +72,12 @@ export default {
         initScrollbar('sidenav')
       }
     },
+    async logout() {
+      const result = await loginAPI.logout(this.$store.state.session_id)
+      // do we have to check success?
+      this.$store.dispatch('logout')
+      this.$router.push('/login')
+    },
   },
   mounted() {
     this.initScrollbar()
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 3b91a9d51..afa48828a 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -28,6 +28,7 @@
 <script>
 import { BaseNav } from '@/components'
 import VueQrcode from 'vue-qrcode'
+import loginAPI from '../../apis/loginAPI'
 
 export default {
   components: {