diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
index 0729fad0c..070b811bf 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
@@ -39,7 +39,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 	/** Show error message */
 	public static final String TEMPLATE_SERVER_ERROR = Template.ERROR_MESSAGE.toString();
 
-	public static final String BODY_LOGIN_NAME = "loginName";
+	public static final String BODY_LOGIN_NAME = "username";
 	public static final String BODY_FORM_ACTION = "formAction";
 	public static final String BODY_INFO_MESSAGE = "infoMessage";
 	public static final String BODY_ERROR_MESSAGE = "errorMessage";
diff --git a/webapp/web/templates/freemarker/body/login/login-form.ftl b/webapp/web/templates/freemarker/body/login/login-form.ftl
index f37a65503..4e42b728f 100644
--- a/webapp/web/templates/freemarker/body/login/login-form.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-form.ftl
@@ -27,7 +27,7 @@
        
        <form action="${formAction}" method="post">
               <label for="loginName">Email or Username</label>
-              <input id="loginName" class="focus" name="loginName" type="text" value="${loginName}"  />
+              <input id="loginName" class="focus" name="loginName" type="text" value="${username}"  />
               <label for="loginPassword">Password</label>
               <input id="loginPassword" type="password" name="loginPassword"  />
               <input name="loginForm"  type="submit" class="submit" value="Log in"/>