Index: branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r7860 -r9989
--- branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7860)
+++ branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 9989)
@@ -37,18 +37,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="u" function="IsSingle"/>
+				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="u" function="IsLast"/>
+					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="u" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -60,14 +60,14 @@
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
 <table class="edit-form">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>