diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index d81d0a47..f51c210b 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -2,7 +2,7 @@
   <div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}">
     <div class="content-block" :class="specialClass">
       <div class="block-actions" v-if="canEditContentBlock && editModule">
-        <user-widget v-bind="me" class="block-actions__user-widget content-block__user-widget"></user-widget>
+        <user-widget :show-menu="false" v-bind="me" class="block-actions__user-widget content-block__user-widget"></user-widget>
         <more-options-widget>
           <li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li>
           <li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li>
diff --git a/client/src/components/UserWidget.vue b/client/src/components/UserWidget.vue
index a8224a46..dfddf48e 100644
--- a/client/src/components/UserWidget.vue
+++ b/client/src/components/UserWidget.vue
@@ -1,27 +1,28 @@
 <template>
-    <div class="user-widget" :class="{'user-widget--is-profile': isProfile}">
-      <div class="user-widget__avatar" @click="toggleShowPopover()">
-        <avatar :avatar-url="avatarUrl" :icon-highlighted="isProfile"/>
-      </div>
-      <widget-popover v-if="showPopover"
-                      @hide-me="showPopover = false"
-                      :mobile="mobile"
-                      class="user-widget__popover ">
-        <li class="popover-links__link popover-links__link--large popover-links__link--emph">{{firstName}} {{lastName}}</li>
-        <li class="popover-links__link popover-links__link--large">
-          <router-link to="/me/activity" @click="toggleShowPopover()">Aktivität</router-link>
-        </li>
-        <li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
-          <router-link to="/me/profile">Profil</router-link>
-        </li>
-        <li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
-          <router-link to="/me/myclasses">Klassenliste</router-link>
-        </li>
-        <li class="popover-links__link popover-links__link--large" data-cy="logout" @click="logout()">
-          <a>Logout</a>
-        </li>
-    </widget-popover>
+  <div class="user-widget" :class="{'user-widget--is-profile': isProfile}">
+    <div class="user-widget__avatar" @click="toggleShowPopover()">
+      <avatar :avatar-url="avatarUrl" :icon-highlighted="isProfile"/>
     </div>
+    <widget-popover v-if="showPopover && showMenu"
+                    @hide-me="showPopover = false"
+                    :mobile="mobile"
+                    class="user-widget__popover ">
+      <li class="popover-links__link popover-links__link--large popover-links__link--emph">{{firstName}} {{lastName}}
+      </li>
+      <li class="popover-links__link popover-links__link--large">
+        <router-link to="/me/activity" @click="toggleShowPopover()">Aktivität</router-link>
+      </li>
+      <li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
+        <router-link to="/me/profile">Profil</router-link>
+      </li>
+      <li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
+        <router-link to="/me/myclasses">Klassenliste</router-link>
+      </li>
+      <li class="popover-links__link popover-links__link--large" data-cy="logout" @click="logout()">
+        <a>Logout</a>
+      </li>
+    </widget-popover>
+  </div>
 </template>
 
 <script>
@@ -34,15 +35,19 @@
       firstName: {
         type: String
       },
-        lastName: {
+      lastName: {
         type: String
       },
-        avatarUrl: {
+      avatarUrl: {
         type: String
       },
-        mobile: {
+      mobile: {
         type: Boolean,
         default: false
+      },
+      showMenu: {
+        type: Boolean,
+        default: true
       }
     },
 
@@ -54,13 +59,17 @@
 
     methods: {
       toggleShowPopover() {
-        this.showPopover = !this.showPopover;
+        if (this.showMenu) {
+          this.showPopover = !this.showPopover;
+        }
       },
       logout() {
         this.$apollo.mutate({
           mutation: LOGOUT_MUTATION,
         }).then(({data}) => {
-          if (data.logout.success) { location.replace('/') }
+          if (data.logout.success) {
+            location.replace('/')
+          }
         });
       }
     },
diff --git a/client/src/components/objective-groups/Objective.vue b/client/src/components/objective-groups/Objective.vue
index 1ffc52a2..4b4690fe 100644
--- a/client/src/components/objective-groups/Objective.vue
+++ b/client/src/components/objective-groups/Objective.vue
@@ -4,7 +4,7 @@
       v-if="editModule"
       :block="objective"></visibility-action>
     <div class="block-actions" v-if="editModule && canEdit">
-      <user-widget class="block-actions__user-widget objective__user-widget" v-bind="me"></user-widget>
+      <user-widget class="block-actions__user-widget objective__user-widget" :show-menu="false" v-bind="me"></user-widget>
       <more-options-widget>
         <div class="popover-links__link"><a @click="deleteObjective(objective)">Löschen</a></div>
       </more-options-widget>