diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 50651209c..d7e26f593 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -10,23 +10,17 @@
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
       <b-collapse id="nav-collapse" is-nav>
-        <b-navbar-nav >
+        <b-navbar-nav>
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
           <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
           <hr />
-          <b-nav-item to="#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
+          <b-nav-item to="#" class="mb-3" @click="$emit('get-elopage-link')">
             {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
-          <b-nav-item
-            v-if="$store.state.isAdmin"
-            to="#"
-            class="mb-3"
-            @click="this.$emit('admin')"
-            target="_blank"
-          >
+          <b-nav-item v-if="$store.state.isAdmin" to="#" class="mb-3" @click="$emit('admin')">
             {{ $t('admin_area') }}
           </b-nav-item>
           <b-nav-item class="mb-3" @click="$emit('logout')">
@@ -36,24 +30,7 @@
 
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto">
-          <b-nav-item-dropdown right>
-            <!-- Using 'button-content' slot -->
-            <template #button-content>
-              <em>
-                {{ $store.state.email }}
-              </em>
-            </template>
-            <b-dropdown-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-dropdown-item>
-            <b-dropdown-item @click="this.$emit('get-elopage-link')" target="_blank">
-              {{ $t('members_area') }}
-            </b-dropdown-item>
-            <b-dropdown-item @click="this.$emit('admin')" target="_blank">
-              {{ $t('admin_area') }}
-            </b-dropdown-item>
-            <b-dropdown-item @click="$emit('logout')">
-              {{ $t('logout') }}
-            </b-dropdown-item>
-          </b-nav-item-dropdown>
+          <b-nav-item to="/profile" right>{{ $store.state.email }}</b-nav-item>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 40c02c2fd..d1409a681 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -15,7 +15,7 @@
           <b-nav vertical class="w-100">
             <b-nav-item class="mb-3" active>Active</b-nav-item>
             <b-nav-item class="mb-3">Link</b-nav-item>
-            <b-nav-item class="mb-3">Another Link</b-nav-item>
+            <b-nav-item class="mb-3" @click="$emit('admin')">{{ $t('admin_area') }}</b-nav-item>
             <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
           </b-nav>
         </div>