diff --git a/3.0/modules/albumpassword/helpers/albumpassword_event.php b/3.0/modules/albumpassword/helpers/albumpassword_event.php
index dd83c4d9..43747584 100644
--- a/3.0/modules/albumpassword/helpers/albumpassword_event.php
+++ b/3.0/modules/albumpassword/helpers/albumpassword_event.php
@@ -80,7 +80,7 @@ class albumpassword_event_Core {
                ->label(t("Remove password"))
                ->css_id("g-album-password-remove")
                ->url(url::site("albumpassword/remove/" . $item->id)));
-        } else {
+        } elseif ($item->id != 1) {
           $menu->get("options_menu")
                ->append(Menu::factory("dialog")
                ->id("albumpassword_assign")
diff --git a/3.1/modules/albumpassword/helpers/albumpassword_event.php b/3.1/modules/albumpassword/helpers/albumpassword_event.php
index dd83c4d9..43747584 100644
--- a/3.1/modules/albumpassword/helpers/albumpassword_event.php
+++ b/3.1/modules/albumpassword/helpers/albumpassword_event.php
@@ -80,7 +80,7 @@ class albumpassword_event_Core {
                ->label(t("Remove password"))
                ->css_id("g-album-password-remove")
                ->url(url::site("albumpassword/remove/" . $item->id)));
-        } else {
+        } elseif ($item->id != 1) {
           $menu->get("options_menu")
                ->append(Menu::factory("dialog")
                ->id("albumpassword_assign")