diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css
index c7867488f..218b24029 100644
--- a/webapp/web/css/login.css
+++ b/webapp/web/css/login.css
@@ -60,19 +60,19 @@ p.request-account {
     font-size:0.9em;
     line-height:30px;
 }
-#confirmationAlert {
+#confirmation-alert {
     color:#169f43;
     padding:0px;
     margin-bottom:5px;
     height:30px;
 }
-#confirmationAlert img {
+#confirmation-alert img {
     float:left;
     margin:0;
     padding:0;
     vertical-align:middle;
 }
-#confirmationAlert p {
+#confirmation-alert p {
     padding-left:30px;
     font-size:0.9em;
     line-height:30px;
@@ -83,7 +83,7 @@ p.request-account {
 .red {
     color:#900;
 }
-p.passwordNote {
+p.password-note {
     margin:0;
     padding:0;
     margin-top:-8px;
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index add02203a..a79a3137c 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -18,11 +18,9 @@
         <h2>Log in</h2>
 
         <noscript>
-            <section id="javascriptDisableWrapper">
-                <section id="javascriptDisableContent">
-                    <img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
-                    <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
-                </section>
+            <section id="error-alert">
+                <img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
+                <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
             </section>
         </noscript>
     
@@ -71,13 +69,13 @@
             </#if>
            
             <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required />
-                <label for="newPassword">New Password</label>
-                <input id="newPassword" class="focus text-field" type="password" name="newPassword"  required />
+                <label for="new-password">New Password</label>
+                <input id="new-password" class="focus text-field" type="password" name="newPassword"  required />
                 
-                <p class="passwordNote">Minimum of 6 characters in length.</p>
+                <p class="password-note">Minimum of 6 characters in length.</p>
                 
-                <label for="confirmPassword">Confirm Password</label>
-                <input id="confirmPassword" class="text-field" type="password" name="confirmPassword"  />
+                <label for="confirm-password">Confirm Password</label>
+                <input id="confirm-password" class="text-field" type="password" name="confirmPassword"  />
                 
                  <p class="submit-password"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p>
             </form>