Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r881 -r1566
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 881)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 1566)
@@ -111,7 +111,10 @@
 }
 else
 {   
-    $en = GetVar('en');
+	$direct_id = GetVar('direct_id');
+	if($direct_id) $_POST['itemlist'] = Array($direct_id);
+	
+	$en = GetVar('en');
     if (isset($_POST["itemlist"]))
     {         
         $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);                
@@ -167,11 +170,13 @@
 $title = GetTitle("la_Text_User", "la_Text_General", $c->Get('PortalUserId'), $c->Get('Login'));
 $c->Data=inp_htmlize($c->Data);
 
+$saveURL = $admin."/".$objSession->GetVariable('ReturnScript');
+
 //Display header
 $sec = $objSections->GetSection($section);
 $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) )
 {