Index: branches/RC/core/admin_templates/users/users_edit_custom.tpl
===================================================================
diff -u -r11141 -r11538
--- branches/RC/core/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 11141)
+++ branches/RC/core/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 11538)
@@ -1,5 +1,6 @@
-<inp2:m_include t="incs/header"/>
+<inp2:adm_SetPopupSize width="720" height="500"/>
 
+<inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_custom" tab_preset="Default"/>
 
 <!-- ToolBar --->
@@ -47,16 +48,24 @@
 				</inp2:m_if>
 			</script>
 		</td>
+
+		<inp2:m_if check="u_DisplayOriginal" display_original="1">
+			<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTabOriginal"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
+		</inp2:m_if>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_include t="incs/custom_blocks"/>
+
 <inp2:m_if check="u_DisplayOriginal" display_original="1">
 	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="u" value_field="Value" per_page="-1" grid="SeparateTabOriginal" header_block="grid_column_title_no_sorting" no_init="no_init" original_title="la_section_OriginalValues" display_original="1"/>
 <inp2:m_else/>
 	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="u" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
 </inp2:m_if>
 
+<input type="hidden" name="cf_type" value="<inp2:u_UnitOption name='ItemType'/>"/>
 
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file