diff --git a/www/newimageid_ez.php3 b/www/newimageid_ez.php3
index b52e01663c4258ed14acfb6abf19d705e9f5dd62..3c52c87953eece0bca3232a297b364d54bde7edc 100644
--- a/www/newimageid_ez.php3
+++ b/www/newimageid_ez.php3
@@ -985,8 +985,10 @@ if (! isset($node)) {
 }
 WRITESUBMENUBUTTON("Create a new Image Descriptor",
 		   "newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create a new OS Descriptor",
-		   "newosid_form.php3");
+if ($isadmin) {
+    WRITESUBMENUBUTTON("Create a new OS Descriptor",
+	  	       "newosid_form.php3");
+}
 WRITESUBMENUBUTTON("Image Descriptor list",
 		   "showimageid_list.php3");
 WRITESUBMENUBUTTON("OS Descriptor list",
diff --git a/www/showimageid.php3 b/www/showimageid.php3
index eb91007e9175a7e1fa9a919b1d5cd832b8dc895f..c565b865514d0f4d98540258d57d9ebd4b3ed0b7 100644
--- a/www/showimageid.php3
+++ b/www/showimageid.php3
@@ -17,6 +17,7 @@ PAGEHEADER("Image Descriptor");
 #
 $uid = GETLOGIN();
 LOGGEDINORDIE($uid);
+$isadmin = ISADMIN($uid);
 
 #
 # Verify form arguments.
@@ -46,8 +47,10 @@ WRITESUBMENUBUTTON("Delete this Image Descriptor",
 		   "deleteimageid.php3?imageid=$fooid");
 WRITESUBMENUBUTTON("Create a new Image Descriptor",
 		   "newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create a new OS Descriptor",
-		   "newosid_form.php3");
+if ($isadmin) {
+    WRITESUBMENUBUTTON("Create a new OS Descriptor",
+		       "newosid_form.php3");
+}
 WRITESUBMENUBUTTON("Image Descriptor list",
 		   "showimageid_list.php3");
 WRITESUBMENUBUTTON("OS Descriptor list",
diff --git a/www/showosinfo.php3 b/www/showosinfo.php3
index a7a612a99b30ad00cabd063e4c23e99869e8605a..cdcc45e3431b4a6352d6a49d2215023db6e02e6b 100644
--- a/www/showosinfo.php3
+++ b/www/showosinfo.php3
@@ -17,6 +17,7 @@ PAGEHEADER("OS Descriptor Information");
 #
 $uid = GETLOGIN();
 LOGGEDINORDIE($uid);
+$isadmin = ISADMIN($uid);
 
 #
 # Verify form arguments.
@@ -41,8 +42,10 @@ SUBPAGESTART();
 SUBMENUSTART("More Options");
 WRITESUBMENUBUTTON("Delete this OS Descriptor",
 		   "deleteosid.php3?osid=$osid");
-WRITESUBMENUBUTTON("Create a new OS Descriptor",
-		   "newosid_form.php3");
+if ($isadmin) {
+     WRITESUBMENUBUTTON("Create a new OS Descriptor",
+			"newosid_form.php3");
+}
 WRITESUBMENUBUTTON("Create a new Image Descriptor",
 		   "newimageid_ez.php3");
 WRITESUBMENUBUTTON("OS Descriptor list",