diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index f3046fa740..0c9fb6f9fc 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -20,7 +20,7 @@ export default class EmailToLDAP extends React.Component {
         e.preventDefault();
         var state = {};
 
-        const password = ReactDOM.findDOMNode(this.refs.password).value.trim();
+        const password = ReactDOM.findDOMNode(this.refs.emailpassword).value.trim();
         if (!password) {
             state.error = Utils.localizeMessage('claim.email_to_ldap.pwdError', 'Please enter your password.');
             this.setState(state);
@@ -104,13 +104,19 @@ export default class EmailToLDAP extends React.Component {
                             }}
                         />
                     </p>
+                    <input
+                        type='text'
+                        style={{display: 'none'}}
+                        name='fakeusernameremembered'
+                    />
                     <div className={formClass}>
                         <input
                             type='password'
                             className='form-control'
-                            name='password'
-                            ref='password'
-                            placeholder={Utils.localizeMessage('claim.email_to_ldap.pwd', 'Password')}
+                            name='emailPassword'
+                            ref='emailpassword'
+                            autoComplete='off'
+                            placeholder={Utils.localizeMessage('claim.email_to_ldap.emailPwd', 'Email Password')}
                             spellCheck='false'
                         />
                     </div>
@@ -130,6 +136,7 @@ export default class EmailToLDAP extends React.Component {
                             className='form-control'
                             name='ldapId'
                             ref='ldapid'
+                            autoComplete='off'
                             placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID')}
                             spellCheck='false'
                         />
@@ -140,6 +147,7 @@ export default class EmailToLDAP extends React.Component {
                             className='form-control'
                             name='ldapPassword'
                             ref='ldappassword'
+                            autoComplete='off'
                             placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password')}
                             spellCheck='false'
                         />