diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php
index 9f49e1fa05..a0a625c8f0 100755
--- a/usr/local/www/services_snmp.php
+++ b/usr/local/www/services_snmp.php
@@ -83,7 +83,7 @@ if ($_POST) {
 
 		$reqdfields = explode(" ", "syslocation");
 		$reqdfieldsn = explode(",", "System location");
-		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);		
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);			
 	}
 
 	if ($_POST['trapenable']) {
@@ -114,7 +114,7 @@ if ($_POST) {
 	if (!$input_errors) {
 		$config['snmpd']['enable'] = $_POST['enable'] ? true : false;
 		$config['snmpd']['pollport'] = $_POST['pollport'];
-		$config['snmpd']['syslocation'] = $_POST['syslocation'];
+		$config['snmpd']['syslocation'] = $_POST['syslocation'];	
 		$config['snmpd']['syscontact'] = $_POST['syscontact'];
 		$config['snmpd']['rocommunity'] = $_POST['rocommunity'];
 		/* disabled until some docs show up on what this does.
@@ -302,14 +302,24 @@ function enable_change(whichone) {
 		    	*/ 
 ?>
 
-                <tr>
-                  <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                  <td width="78%" class="vtable">
-                   <input name="trapenable" type="checkbox" value="yes" <?php if ($pconfig['trapenable']) echo "checked"; ?> onClick="enable_change(this)">
-                    <strong>Enable SNMP Traps</strong>
+                <tr> 
+                  <td width="22%" valign="top">&nbsp;</td>
+                  <td width="78%"> 
+                    <input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)"> 
                   </td>
                 </tr>
 
+		<tr><td>&nbsp;</td></tr>
+
+                <tr> 
+  		  <td colspan="2" valign="top" class="optsect_t">
+  			<table border="0" cellspacing="0" cellpadding="0" width="100%">
+  			<tr><td class="optsect_s"><strong>Enable SNMP Traps</strong></td>
+			<td align="right" class="optsect_s"><input name="trapenable" type="checkbox" value="yes" <?php if ($pconfig['trapenable']) echo "checked"; ?> onClick="enable_change(this)"> <strong>Enable</strong></td></tr>
+  			</table></td>
+                </tr>
+
+
                 <tr>
                   <td width="22%" valign="top" class="vncellreq">Trap server</td>
                   <td width="78%" class="vtable">