diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b1db03ecbc1..d1a80de5b33 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -161,14 +161,14 @@
                   <div class="form-group">
 
                     <label for="username"><%= t('layout._header.login.username') %></label>
-                    <%= f.text_field :username, { tabindex: 1, class: 'form-control', id: 'username' } %>
+                    <%= f.text_field :username, { tabindex: 1, class: 'form-control', id: 'username-login' } %>
 
                   </div>
 
                   <div class="form-group">
 
                     <label for="password"><%= t('layout._header.login.password') %></label>
-                    <%= f.password_field :password, { tabindex: 2, class: 'form-control', id: 'password' } %>
+                    <%= f.password_field :password, { tabindex: 2, class: 'form-control', id: 'password-login' } %>
 
                   </div>
 
diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb
index b8a5e81dedb..c8bd4055a28 100644
--- a/app/views/user_sessions/new.html.erb
+++ b/app/views/user_sessions/new.html.erb
@@ -10,14 +10,14 @@
   <div class="form-group">
 
     <label for="username"><%= t('user_sessions.new.username') %></label>
-    <%= f.text_field :username, { tabindex: 1, class: 'form-control', id: 'username' } %>
+    <%= f.text_field :username, { tabindex: 1, class: 'form-control', id: 'username-signup' } %>
 
   </div>
 
   <div class="form-group">
 
     <label for="password"><%= t('user_sessions.new.password') %></label>
-    <%= f.password_field :password, { tabindex: 2, class: 'form-control', id: 'password' } %>
+    <%= f.password_field :password, { tabindex: 2, class: 'form-control', id: 'password-signup' } %>
 
   </div>