Index: ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- ZenModel/skins/zenmodel/userCommandsMacros.pt	(revision 8398)
+++ ZenModel/skins/zenmodel/userCommandsMacros.pt	(working copy)
@@ -89,9 +89,10 @@
 </tr>
 
 
-<tal:block metal:define-macro="runCommandMenu"
-    tal:condition="python:here.isManager() and here.meta_type in
-    ['DeviceClass','Device','Location','DeviceGroup','System','Software']">
+<tal:block metal:define-macro="runCommandMenu" 
+    tal:condition="python:(user.has_role('Change Device') or here.isManager()) 
+        and here.meta_type in ['DeviceClass','Device','Location','DeviceGroup', 
+                               'System','Software']">
 <li tal:define="commandIds here/getUserCommandIds">
 <form name="command_proxy" method="post"
 tal:define="mypath here/getPrimaryUrlPath"