Index: trunk/admin/users/adduser_groups.php
===================================================================
diff -u -r916 -r1566
--- trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 916)
+++ trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 1566)
@@ -144,9 +144,11 @@
 $objListToolBar->Set("CheckClass",$CheckClass);
 $objListToolBar->Set("CheckForm",$ListForm);
 
-$objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','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');","do_edit_save('save_edit_buttons','UserEditStatus','".$admin."/users/user_list.php',2);","tool_cancel.gif");
+$saveURL = $admin."/".$objSession->GetVariable('ReturnScript');
 
+$objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','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');","do_edit_save('save_edit_buttons','UserEditStatus','".$saveURL."',2);","tool_cancel.gif");
+
 if($itemcount == 1) $objListToolBar->Add("divider");
 
 if ( isset($en_prev) || isset($en_next) )