Index: trunk/admin/users/adduser_permissions.php
===================================================================
diff -u -r822 -r1566
--- trunk/admin/users/adduser_permissions.php	(.../adduser_permissions.php)	(revision 822)
+++ trunk/admin/users/adduser_permissions.php	(.../adduser_permissions.php)	(revision 1566)
@@ -129,12 +129,14 @@
 
 $formaction = $adminURL."/user/adduser_permissions.php?".$envar;
 
+$saveURL = $admin."/".$objSession->GetVariable('ReturnScript');
+
 //Display header
 $sec = $objSections->GetSection($section);
 //echo "<pre>"; print_r($sec); echo "</pre>";
 $objCatToolBar = new clsToolBar();
-$objCatToolBar->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");
-$objCatToolBar->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");
+$objCatToolBar->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");
+$objCatToolBar->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) )
 {