diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
index 2ab1cec07..9048f2251 100644
--- a/app/controllers/admin/sessions_controller.rb
+++ b/app/controllers/admin/sessions_controller.rb
@@ -1,14 +1,17 @@
-class Admin::SessionsController < SessionsController
+class Admin::SessionsController < Devise::SessionsController
+  skip_authorization_check only: :create
   layout 'admin/application'
 
-  def create
-    super
-  end
-
   def login
   end
 
-  def find_user_by_idc(idc)
-    AdminUser.find_by(identity_code: idc)
-  end
+  # def create
+    # @user = AdminUser.first if params[:user1]
+    # @user = AdminUser.second if params[:user2]
+
+    # return redirect_to :back, alert: 'No user' if @user.blank?
+
+    # flash[:notice] = I18n.t('welcome')
+    # sign_in_and_redirect @user, event: :authentication
+  # end
 end
diff --git a/app/controllers/registrant/sessions_controller.rb b/app/controllers/registrant/sessions_controller.rb
index 472035ca0..16f0e822a 100644
--- a/app/controllers/registrant/sessions_controller.rb
+++ b/app/controllers/registrant/sessions_controller.rb
@@ -1,4 +1,4 @@
-class Registrant::SessionsController < ::SessionsController
+class Registrant::SessionsController < Devise::SessionsController
   layout 'registrant/application'
   helper_method :depp_controller?
   def depp_controller?
diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index bbd06cbd4..4490b0609 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -1,4 +1,4 @@
-class Registrar::SessionsController < ::SessionsController
+class Registrar::SessionsController < Devise::SessionsController
   layout 'registrar/application'
   helper_method :depp_controller?
   def depp_controller?
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 0f3e913f4..54816bf7a 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -14,7 +14,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = 'noreply@example.com'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -210,7 +210,7 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = false
+  config.scoped_views = true
 
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes (usually :user).
diff --git a/config/routes.rb b/config/routes.rb
index f2faab8a8..70c991a7c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -217,11 +217,7 @@ Rails.application.routes.draw do
 
     devise_scope :user do
       get 'login' => 'sessions#login'
-      # get 'login/mid' => 'sessions#login_mid'
-      # post 'login/mid' => 'sessions#mid'
-
       post 'sessions' => 'sessions#create'
-      post 'mid' => 'sessions#mid'
       get 'logout' => '/devise/sessions#destroy'
     end
 
@@ -230,9 +226,5 @@ Rails.application.routes.draw do
 
   devise_for :users
 
-  devise_scope :user do
-    get 'login' => 'admin/sessions#login'
-  end
-
   root to: redirect('admin/login')
 end