diff --git a/web/zm_html_styles.css b/web/zm_html_styles.css
index c38e3936f..92814a85e 100644
--- a/web/zm_html_styles.css
+++ b/web/zm_html_styles.css
@@ -120,6 +120,9 @@ a:hover {
 input[disabled] {
 	color: #888888;
 }
+input[set] {
+	border: 1px #7F7FB2 dashed;
+}
 .textsmall {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 9px;
diff --git a/web/zm_html_view_devices.php b/web/zm_html_view_devices.php
index a66355770..070e8bd2e 100644
--- a/web/zm_html_view_devices.php
+++ b/web/zm_html_view_devices.php
@@ -124,8 +124,8 @@ foreach( $devices as $device )
 ?>
 <tr bgcolor="#FFFFFF">
 <td align="left"><?= makeLink( "javascript:editDevice( ".$device['Id']." )", '<span class="'.$fclass.'">'.$device['Name'].' ('.$device['KeyString'].')</span>', canEdit( 'Devices' ) ) ?></td>
-<td align="center"><input type="button" class="form" value="<?= $zmSlangOn ?>" onClick="switchDeviceOn( '<?= $device['KeyString'] ?>' )"<?= ($device['Status'] != 'ON' && canEdit( 'Devices' ) )?"":" disabled" ?>></td>
-<td align="center"><input type="button" class="form" value="<?= $zmSlangOff ?>" onClick="switchDeviceOff( '<?= $device['KeyString'] ?>' )"<?= ($device['Status'] != 'OFF' && canEdit( 'Devices' ) )?"":" disabled" ?>></td>
+<td align="center"><input type="button" class="form" value="<?= $zmSlangOn ?>" onClick="switchDeviceOn( '<?= $device['KeyString'] ?>' )"<?= ($device['Status'] != 'ON' && canEdit( 'Devices' ) )?"":' set="set"' ?>></td>
+<td align="center"><input type="button" class="form" value="<?= $zmSlangOff ?>" onClick="switchDeviceOff( '<?= $device['KeyString'] ?>' )"<?= ($device['Status'] != 'OFF' && canEdit( 'Devices' ) )?"":' set="set"' ?>></td>
 <td align="center" class="text"><input type="checkbox" class="form" name="mark_dids[]" value="<?= $device['Id'] ?>" onClick="configureButtons( document.devices_form, 'mark_dids' );"<?php if ( !canEdit( 'Devices' ) ) {?> disabled<?php } ?>></td>
 </tr>
 <?php
diff --git a/web/zm_xhtml_view_devices.php b/web/zm_xhtml_view_devices.php
index b4113bcb4..661accffc 100644
--- a/web/zm_xhtml_view_devices.php
+++ b/web/zm_xhtml_view_devices.php
@@ -56,8 +56,8 @@ foreach( $devices as $device )
 ?>
 <tr>
 <td align="left" style="width: 60%"><span class="<?= $fclass ?>"><?= substr( $device['Name'], 0, 16 ) ?></span></td>
-<td align="center"><?= makeLink( $PHP_SELF."?view=".$view."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", $zmSlangOn, $device['Status'] != 'ON' && canEdit( 'Devices' ) ) ?></td>
-<td align="center"><?= makeLink( $PHP_SELF."?view=".$view."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", $zmSlangOff, $device['Status'] != 'OFF' && canEdit( 'Devices' ) ) ?></td>
+<td align="center"><?= makeLink( $PHP_SELF."?view=".$view."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", $zmSlangOn, canEdit('Devices') ) ?></td>
+<td align="center"><?= makeLink( $PHP_SELF."?view=".$view."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", $zmSlangOff, canEdit('Devices') ) ?></td>
 </tr>
 <?php
 }