 	<cfswitch expression="#form.mainAction#">
 	<!--- UPDATE --->
 		<cfcase value="#stText.Buttons.Update#">
-			<cfadmin 
-				action="updateDebug"
-				type="#request.adminType#"
-				password="#session["password"&request.adminType]#"
-				debug="#form.debug#"
-				debugTemplate=""
-				remoteClients="#request.getRemoteClients()#">
+
+			<cfif form.debug == "resetServerAdmin">
+				
+				<cfadmin action="updateDebug"
+					type="#request.adminType#"
+					password="#session["password"&request.adminType]#"					
+	                debug=""
+					debugTemplate=""	                
+					remoteClients="#request.getRemoteClients()#">
 			
+			<cfelse>
+
+				<cfadmin action="updateDebug"
+					type="#request.adminType#"
+					password="#session["password"&request.adminType]#"
+					debug="#form.debug#"
+					debugTemplate=""
+					remoteClients="#request.getRemoteClients()#">
+			</cfif>
 		</cfcase>
-	<!--- reset to server setting --->
-		<cfcase value="#stText.Buttons.resetServerAdmin#">
-			<cfadmin 
-				action="updateDebug"
-				type="#request.adminType#"
-				password="#session["password"&request.adminType]#"
-				
-                debug=""
-				debugTemplate=""
-                
-				remoteClients="#request.getRemoteClients()#">
-			
-		</cfcase>
+
     <!--- delete --->
 		<cfcase value="#stText.Buttons.Delete#">
 				<cfset data.rows=toArrayFromForm("row")>

						<td colspan="2">
							<input type="submit" class="button submit" name="mainAction" value="#stText.Buttons.Update#">
							<input type="reset" class="reset" name="cancel" value="#stText.Buttons.Cancel#">
							<cfif request.adminType EQ "web">
								<input class="button submit" type="submit" name="mainAction" value="#stText.Buttons.resetServerAdmin#">
							</cfif>
						</td>
					</tr>
				</tfoot>

				<tr>
					<th scope="row">#stText.Debug.EnableDebugging#</th>
					<td>
						<cfset lbl = _debug.debug ? stText.general.yes : stText.general.no>
						<cfif hasAccess>
							
							<cfif request.admintype EQ "web">

								<label><input type="radio" name="debug" value="true" #_debug.debugsrc == "web" && _debug.debug ? 'checked="checked"' : ''#> #stText.general.yes#</label>
								&nbsp;
								<label><input type="radio" name="debug" value="false" #_debug.debugsrc == "web" && !_debug.debug ? 'checked="checked"' : ''#> #stText.general.no#</label>
								&nbsp;
								<label><input type="radio" name="debug" value="resetServerAdmin" #_debug.debugsrc == "server" ? 'checked="checked"' : ''#> #stText.Regional.ServerProp[request.adminType]# <cfif _debug.debugsrc == "server"> (#lbl#)</cfif></label>
							<cfelse>

								<label><input type="radio" name="debug" value="true" #_debug.debug ? 'checked="checked"' : ''#> #stText.general.yes#</label>
								&nbsp;
								<label><input type="radio" name="debug" value="false" #!_debug.debug ? 'checked="checked"' : ''#> #stText.general.no#</label>		
							</cfif>
						<cfelse>
							<b>#lbl#</b>
							<input type="hidden" name="debug" value="#_debug.debug#">
