Index: trunk/admin/include/tabs.js
===================================================================
diff -u -r1016 -r1566
--- trunk/admin/include/tabs.js	(.../tabs.js)	(revision 1016)
+++ trunk/admin/include/tabs.js	(.../tabs.js)	(revision 1566)
@@ -147,7 +147,7 @@
 	
 	if(full_env.substr(0,3) != "env") full_env = 'env=' + full_env;
 	f = document.getElementById(formname);
-     
+	 
 	if(f)
 	{ 
 		var valid = false;	
@@ -165,10 +165,12 @@
       	}
         if(valid || save_value==2 || save_value==-1)
         {      
-          	var URLPrefix = '';
+        	var URLPrefix = '';
           	if( targetURL.substring(0, rootURL.length) != rootURL ) URLPrefix = rootURL;
           
-          	f.action = URLPrefix + targetURL + '?' + full_env;   
+          	f.action = URLPrefix + targetURL;
+          	if( !f.action.match('(.*)?env=(.*)') ) f.action += '?' + full_env;
+          	
       	  	if(status_field.length > 0)
       	  	{                 
           		f.elements[status_field].value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save          
@@ -181,7 +183,9 @@
           if(!valid) alert(ErrorMsg);
 	}
 	else
+	{
 		alert('Form '+formname+' was not found.');
+	}
 }
 
 //Used when the save or cancel buttin is hit	
@@ -195,7 +199,10 @@
     	f = document.getElementById(formname);
     	if(f)
     	{    
-      		f.action = rootURL + targetURL + '?' + full_env;
+      		f.action = rootURL + targetURL;
+
+      		if( !f.action.match('(.*)?env=(.*)') ) f.action += '?' + full_env;
+      		
       		//alert(f.action);
       		if(status_field.length>0)
       		{