diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index bcce07f..96d3804 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -25,6 +25,16 @@ import DarkModeSwitcher from "./DarkModeSwitcher.vue";
 import { useRoute } from "vue-router";
 import { pb, login, logout } from "../service/pocketbase";
 
+interface MenuItem {
+  label: string;
+  icon: string;
+  route?: string;
+  url?: string;
+  info?: string;
+  items?: MenuItem[];
+  command?: (event?: unknown) => void;
+}
+
 const { t } = useI18n({ useScope: "global" });
 const toast = useToast();
 
@@ -44,7 +54,7 @@ onUnmounted(() => {
 });
 
 const items = computed(() => {
-  const menuItems = [
+  const menuItems: MenuItem[] = [
     {
       label: t("createCalendar"),
       icon: "pi pi-fw pi-plus",
@@ -91,10 +101,21 @@ const items = computed(() => {
 
   if (currentUser.value) {
     menuItems.push({
-      label: "Professor Dashboard",
+      label: t("professorDashboard"),
       icon: "pi pi-fw pi-user",
       route: "/professor/dashboard",
     });
+    menuItems.push({
+      label: t("logout"),
+      icon: "pi pi-fw pi-sign-out",
+      command: () => logout(),
+    });
+  } else {
+    menuItems.push({
+      label: t("login"),
+      icon: "pi pi-fw pi-sign-in",
+      command: () => handleLogin(),
+    });
   }
 
   return menuItems;
@@ -180,6 +201,18 @@ function handleDarkModeToggled(isDarkVar: boolean) {
         <span :class="item.icon" />
         <span class="ml-2 p-menuitem-label">{{ item.label }}</span>
       </a>
+      <!-- @ts-ignore TypeScript incorrectly infers MenuItemCommandEvent instead of MouseEvent -->
+      <a
+        v-else-if="item.command"
+        class="flex align-items-center p-menuitem-link"
+        role="menuitem"
+        tabindex="0"
+        @click.prevent.stop="(e) => item.command?.(e as any)"
+        @keydown.enter.prevent.stop="(e) => item.command?.(e as any)"
+      >
+        <span :class="item.icon" />
+        <span class="ml-2 p-menuitem-label">{{ item.label }}</span>
+      </a>
       <span
         v-else
         :class="
@@ -199,20 +232,6 @@ function handleDarkModeToggled(isDarkVar: boolean) {
           @dark-mode-toggled="handleDarkModeToggled"
         ></DarkModeSwitcher>
         <LocaleSwitcher></LocaleSwitcher>
-        <Button
-          v-if="!currentUser"
-          label="Login"
-          icon="pi pi-sign-in"
-          class="p-button-text"
-          @click="handleLogin"
-        />
-        <Button
-          v-else
-          label="Logout"
-          icon="pi pi-sign-out"
-          class="p-button-text"
-          @click="logout"
-        />
       </div>
     </template>
   </Menubar>
@@ -249,4 +268,19 @@ function handleDarkModeToggled(isDarkVar: boolean) {
 :deep(.p-menuitem-link.active .p-menuitem-label::after) {
   width: 100%;
 }
+
+/* Ensure command menu items look like other menu items */
+:deep(a.p-menuitem-link[role="menuitem"]) {
+  cursor: pointer;
+  text-decoration: none;
+  color: inherit;
+}
+
+:deep(a.p-menuitem-link[role="menuitem"]:visited) {
+  color: inherit;
+}
+
+:deep(a.p-menuitem-link[role="menuitem"]:hover) {
+  background-color: var(--surface-hover);
+}
 </style>
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index ffabbc0..2d72156 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -9,6 +9,9 @@
   "description": "Dein individueller Stundenplan mit Sportevents und Prüfungen. Finde kommende Veranstaltungen oder freie Räume zum Lernen und Arbeiten.",
   "english": "Englisch",
   "german": "Deutsch",
+  "login": "Anmelden",
+  "logout": "Abmelden",
+  "professorDashboard": "Mitarbeitende Kalender",
   "toast": {
     "loginError": "Login fehlgeschlagen",
     "loginRestricted": "Login nur für Mitarbeitende der HTWK Leipzig.",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 5466a4d..8ba5c5c 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -9,6 +9,9 @@
   "description": "Your individual timetable with sports events and exams. Find upcoming events or free rooms for studying and working.",
   "english": "English",
   "german": "German",
+  "login": "login",
+  "logout": "logout",
+  "professorDashboard": "employee calendar",
   "toast": {
     "loginError": "login failed",
     "loginRestricted": "login restricted to htwk employees",