Index: trunk/admin/users/adduser_custom.php
===================================================================
diff -u -r881 -r1566
--- trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 881)
+++ trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 1566)
@@ -128,11 +128,13 @@
 
 $formaction = $adminURL."/user/adduser_custom.php?".$envar;
 
+$saveURL = $admin."/".$objSession->GetVariable('ReturnScript');
+
 //Display header
 $sec = $objSections->GetSection($section);
 $objListToolbar = new clsToolBar();
-$objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('edituser','UserEditStatus','".$admin."/users/user_list.php',1);","tool_select.gif");
-$objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('edituser','UserEditStatus','".$admin."/users/user_list.php',2);","tool_cancel.gif");
+$objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('edituser','UserEditStatus','".$saveURL."',1);","tool_select.gif");
+$objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('edituser','UserEditStatus','".$saveURL."',2);","tool_cancel.gif");
 
 if ( isset($en_prev) || isset($en_next) )
 {