diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 76f4188a2..cdefd70ae 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -3,7 +3,10 @@ class SessionsController < Devise::SessionsController
     # TODO: Create ID Card login here:
     # this is just testing config
     # if Rails.env.development? || Rails.env.test?
-    @user = User.find_by(username: 'gitlab') if params[:gitlab]
+    @user = User.first if params[:user1]
+    @user = User.second if params[:user2]
+
+    return redirect_to :back, alert: 'No user' if @user.blank?
 
     session[:current_user_registrar_id] = Registrar.first.id if @user.admin?
 
diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
index 7b3a1da76..e516d6817 100644
--- a/app/views/layouts/login.haml
+++ b/app/views/layouts/login.haml
@@ -5,7 +5,7 @@
     %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
     %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
     %meta{:content => "Full stack top-level domain (TLD) management.", :name => "description"}/
-    %meta{:content => "Gitlab LTD", :name => "author"}/
+    %meta{:content => "Gitlab Ltd", :name => "author"}/
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
     = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
@@ -22,5 +22,8 @@
         %hr
         / TODO: Refactor this when ID card login is done
         - if can? :create, :admin_session
-          = button_to 'ID card (gitlab)', 'sessions',
-            class: 'btn btn-lg btn-primary btn-block', name: 'gitlab'
+          = button_to 'ID card (user1)', 'sessions',
+            class: 'btn btn-lg btn-primary btn-block', name: 'user1'
+          = button_to 'ID card (user2)', 'sessions',
+            class: 'btn btn-lg btn-primary btn-block', name: 'user2'
+