aria-describedby has broken IDref on Sign in email form

AC-97

lms/templates/student_account/form_field.underscore

@@ -40,7 +40,8 @@
            type="<%= type %>"
            name="<%= name %>"
            class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>"
-           aria-describedby="<%= form %>-<%= name %>-desc"
+           <% if ( type !== 'password' ) { %>
+           aria-describedby="<%= form %>-<%= name %>-desc"<% } %>
             <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %>
             <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %>
             <% if ( required ) { %> aria-required="true" required<% } %>
@@ -52,7 +53,7 @@
             <% if ( placeholder ) { %> placeholder="<%= placeholder %>"<% } %>
             value="<%- defaultValue %>"
         />
-        <% if ( instructions ) { %> <span class="tip tip-input" id="<%= form %>-<%= name %>-instructions"><%= instructions %></span><% } %>
+        <% if ( instructions ) { %> <span class="tip tip-input" id="<%= form %>-<%= name %>-desc"><%= instructions %></span><% } %>
     <% } %>
 
     <% if ( type === 'checkbox' ) { %>
@@ -65,4 +66,4 @@
     <% if( form === 'login' && name === 'password' ) { %>
         <a href="#" class="forgot-password field-link"><%- gettext("Forgot password?") %></a>
     <% } %>
-</div>
+</div>
\ No newline at end of file