diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/category.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/category.html.tmpl
index 5f36792f23e..a75e04a5e6a 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/category.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/category.html.tmpl
@@ -22,16 +22,9 @@
 [%# INTERFACE:
   # ...
   #%]
-<script type="text/javascript">
 
-</script>
-
-<form method="POST" action="tr_admin_environment.cgi" name="form1">
+<form method="POST" action="tr_admin_environment.cgi" name="form1" onSubmit="updateCategory();return false;">
 <h3>Category Administration</h3>
-  <input type="hidden" name="action" value="[% action FILTER none %]" />
-  <input type="hidden" name="id" value="[% category.id FILTER none %]" />
-  <input type="hidden" name="type" value="category" />
-  
   <table border="0">
     <tr> 
     <th class="bz_row_header" align="right">Parent Product:</th>
@@ -53,13 +46,5 @@
   
   <br />
   
-  <input name="submit" type="button" value="Submit" onClick="updateCategory()">
-
-
-
-
-
-
-
-
-
+  <input name="submit" type="button" value="Submit">
+</form>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/element.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/element.html.tmpl
index 847bee59e08..1ce6685c3c3 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/element.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/element.html.tmpl
@@ -24,15 +24,8 @@
   # ...
   #%]
 
-
-
-
-<form method="POST" action="tr_admin_environment.cgi" name="form1">
+<form method="POST" action="tr_admin_environment.cgi" name="form1" onsubmit="updateElement();return false">
 <h3>Element Administration</h3>
-  <input type="hidden" name="action" value="[% action FILTER none %]" />
-  <input type="hidden" name="id" value="[% element.id FILTER none %]" />
-  <input type="hidden" name="type" value="element" />
-
 
 <table>
 	<tr>
@@ -125,4 +118,5 @@
 	</tr>
 </table>
   <br />
- <input name="submit" id="element_submit" type="button" value="Submit" onClick="updateElement();">
+ <input name="submit" id="element_submit" type="submit" value="Submit" >
+</form>
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/property.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/property.html.tmpl
index b76ed5230cd..92f9cf1f8f6 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/property.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/property.html.tmpl
@@ -24,15 +24,8 @@
   # ...
   #%]
  
-
-<form method="POST" action="tr_admin_environment.cgi" name="form1">
+<form method="POST" action="tr_admin_environment.cgi" name="form1" onsubmit="updateProperty(); return false">
 <h3>Property Administration</h3>
-
-
-  <input type="hidden" name="action" value="[% action FILTER none %]" />
-  <input type="hidden" name="id" value="[% property.id FILTER none %]" />
-  <input type="hidden" name="type" value="property" />
-  
   <table border="0">
     <tr> 
     	<th class="bz_row_header" align="right">Assiged to Element:</th>
@@ -55,4 +48,4 @@
   
   <br />
   
-  <input name="submit" type="button" value="Submit" onclick="updateProperty()">
\ No newline at end of file
+  <input name="submit" type="submit" value="Submit">
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/valid_exp.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/valid_exp.html.tmpl
index c2800511496..4f2be2f08ad 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/valid_exp.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/valid_exp.html.tmpl
@@ -26,8 +26,6 @@
 
 <form method="POST" onsubmit="submit_valid_exp();" action="tr_admin_environment.cgi" name="form1">
 <h3>Property Value Administration</h3>
-
-
   <input type="hidden" name="action" value="do_edit" />
   <input type="hidden" name="id" value="[% property.id FILTER none %]" />
   <input type="hidden" name="type" value="validexp" />
@@ -67,4 +65,5 @@
   <br />
 
   <input name="submit" type="submit" value="Save Changes">
-<p><b>You must click Save Changes for your changes to take effect</b></p>
\ No newline at end of file
+<p><b>You must click Save Changes for your changes to take effect</b></p>
+</form>
diff --git a/mozilla/webtools/testopia/tr_admin_environment.cgi b/mozilla/webtools/testopia/tr_admin_environment.cgi
index bd169da06aa..a95e1e5dd06 100755
--- a/mozilla/webtools/testopia/tr_admin_environment.cgi
+++ b/mozilla/webtools/testopia/tr_admin_environment.cgi
@@ -520,7 +520,7 @@ sub add_validexp{
 #############################
 sub delete_category{
     my ($id) = (@_);
-    my $category = Bugzilla::Testopia::Environment::Category->new({});
+    my $category = Bugzilla::Testopia::Environment::Category->new($id);
     my $success = $category->obliterate;
     print $success == 1 ? "true" : "false";
 }