diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5cc352e2e..6b2214134 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,8 +17,14 @@ class ApplicationController < ActionController::Base
 
   def after_sign_in_path_for(_resource)
     rt = session[:user_return_to].to_s.presence
-    return session[:user_return_to].to_s if rt && rt != admin_login_path
-    admin_dashboard_path
+    login_paths = [admin_login_path, registrar_login_path]
+    return rt if rt && !login_paths.include?(rt)
+
+    if request.path.match('registrar')
+      registrar_root_path
+    elsif request.path.match('admin')
+      admin_root_path
+    end
   end
 
   def after_sign_out_path_for(_resource)
diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
index fa69b237e..6f98b8b35 100644
--- a/app/views/layouts/login.haml
+++ b/app/views/layouts/login.haml
@@ -21,7 +21,7 @@
         %h2.form-signin-heading.text-center Eesti Interneti SA
         %hr
         / TODO: Refactor this when ID card login is done
-        = button_to 'ID card (user1)', 'sessions',
+        = button_to 'ID card (user1)', admin_sessions_path,
           class: 'btn btn-lg btn-primary btn-block', name: 'user1'
-        = button_to 'ID card (user2)', 'sessions',
+        = button_to 'ID card (user2)', admin_sessions_path,
           class: 'btn btn-lg btn-primary btn-block', name: 'user2'
diff --git a/app/views/layouts/registrar.haml b/app/views/layouts/registrar.haml
index 62bc6adfa..61e63eb0b 100644
--- a/app/views/layouts/registrar.haml
+++ b/app/views/layouts/registrar.haml
@@ -20,7 +20,7 @@
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          = link_to registrar_invoices_path, class: 'navbar-brand' do
+          = link_to registrar_root_path, class: 'navbar-brand' do
             EIS Registrar
             - if unstable_env.present?
               .text-center
diff --git a/config/routes.rb b/config/routes.rb
index 96d564602..01d24b182 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -75,7 +75,7 @@ Rails.application.routes.draw do
       get 'logout' => '/devise/sessions#destroy'
     end
 
-    root 'domains#index'
+    root 'dashboards#show'
   end
 
   namespace(:registrar) do
@@ -96,16 +96,16 @@ Rails.application.routes.draw do
     #   root to: 'domains#index', as: :authenticated_root
     # end
 
-    root 'domains#index'
+    root 'invoices#index'
   end
 
   devise_for :users
 
-  # authenticated :user do
-  #   root to: 'admin/domains#index', as: :authenticated_root
-  # end
+  devise_scope :user do
+    get 'login' => 'admin/sessions#login'
+  end
 
-  root to: redirect('admin/login')
+  root to: redirect('login')
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".