Index: trunk/kernel/admin/include/toolbar/edituser_items.php
===================================================================
diff -u -r979 -r1566
--- trunk/kernel/admin/include/toolbar/edituser_items.php	(.../edituser_items.php)	(revision 979)
+++ trunk/kernel/admin/include/toolbar/edituser_items.php	(.../edituser_items.php)	(revision 1566)
@@ -98,8 +98,11 @@
 function edit_submit(formname, targetURL)
 {
     var env_str = '$envar';
+	var url = '$rootURL' + targetURL;
 
-    document.location = '$rootURL' + targetURL + '?' + env_str;
+	if( !url.match('(.*)?env=(.*)') ) url += '?' + env_str;
+	
+    document.location = url;
 
 }
 
@@ -110,7 +113,9 @@
     f = document.getElementById(formname);
     if(f)
     {    
-      f.action = '$rootURL' + targetURL + '?' + env_str;
+      f.action = '$rootURL' + targetURL;
+	  if( !f.action.match('(.*)?env=(.*)') ) f.action += '?' + env_str;
+      
       f.UserEditStatus.value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save
 	  f.submit();
     }