Index: branches/1.1.x/platform/elements/side_boxes/login.elm.tpl
===================================================================
diff -u -N -r14273 -r14488
--- branches/1.1.x/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 14273)
+++ branches/1.1.x/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 14488)
@@ -84,33 +84,33 @@
 	<form method="post" action="<inp2:m_FormAction />">
 		<inp2:m_if check="u_UseUsernames">
 			<inp2:m_phrase label="lu_username"/><br />
-			<input class="input-text" type="text" name="login" style="width:155px" /><br />
 		<inp2:m_else/>
 			<inp2:m_phrase label="lu_email"/><br />
-			<input class="input-text" type="text" name="email" style="width:155px" /><br />
 		</inp2:m_if>
 
+		<input class="input-text" type="text" name="<inp2:u.login-sidebox_InputName name='UserLogin'/>" value="<inp2:u.login-sidebox_Field name='UserLogin'/>" style="width:155px" /><br />
+
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
 
 		<inp2:m_Phrase label="lu_Password"/><br />
-		<input type="password" class="input-text" name="password" style="width:155px" /><br />
+		<input type="password" class="input-text" name="<inp2:u.login-sidebox_InputName name='UserPassword'/>" value="<inp2:u.login-sidebox_Field name='UserPassword'/>" style="width:155px" /><br />
 
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
 
 		<table>
 			<tr>
 				<td width="10">
-					<input class="button" name="events[u][OnLogin]" type="submit" value="<inp2:m_Phrase label='lu_Login' no_editing='1'/>" /><br />
+					<input class="button" name="events[u.login-sidebox][OnLogin]" type="submit" value="<inp2:m_Phrase label='lu_Login' no_editing='1'/>" /><br />
 				</td>
 				<td align="left">
-					<input type="checkbox" name="cb_remember_login" value="1"/> <span class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></span>
+					<input type="checkbox" name="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" id="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" value="1"/> <label for="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></label>
 				</td>
 			</tr>
 		</table>
 
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="5" height="5" border="0" /><br />
-		<inp2:m_if check="u_HasError" field="any">
-			<span class="field-error"><inp2:u_Error field="ValidateLogin"/></span><br />
+		<inp2:m_if check="u.login-sidebox_HasError" field="any">
+			<span class="field-error"><inp2:u.login-sidebox_Error field="UserLogin"/></span><br />
 		</inp2:m_if>
 
 		<inp2:m_if check="u_RegistrationEnabled">