diff --git a/.rubocop.yml b/.rubocop.yml
index 23a400297..42199a842 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,8 +6,6 @@ AllCops:
     # stuff generated by AR and rails
     - 'db/schema.rb'
     - 'db/migrate/*'
-    # spring generated stuff
-    - 'bin/*'
     # epp support files until 'complexity issues' will be solved
     - 'spec/support/epp.rb'
     - 'spec/support/epp_contact_xml_builder.rb'
diff --git a/Gemfile b/Gemfile
index fe9578694..a7919bb70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,6 +54,9 @@ gem 'ransack', '~> 1.3.0'
 # for rights
 gem 'cancan', '~> 1.6.10'
 
+# for login
+gem 'devise', '~> 3.3.0'
+
 group :assets do
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer',  platforms: :ruby
@@ -112,4 +115,3 @@ group :development, :test do
   # For unique IDs (used by the epp gem)
   gem 'uuidtools', '~> 2.1.4'
 end
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 16e18ef02..8d23eacd5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,6 +31,7 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
+    bcrypt (3.1.7)
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
     builder (3.2.2)
@@ -53,6 +54,12 @@ GEM
       execjs
     coffee-script-source (1.7.0)
     database_cleaner (1.3.0)
+    devise (3.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     diff-lcs (1.2.5)
     epp (1.4.0)
       hpricot
@@ -117,6 +124,7 @@ GEM
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     nprogress-rails (0.1.3.1)
+    orm_adapter (0.5.0)
     parser (2.2.0.pre.4)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
@@ -245,6 +253,8 @@ GEM
       rack
       raindrops (~> 0.7)
     uuidtools (2.1.5)
+    warden (1.2.3)
+      rack (>= 1.0)
     websocket-driver (0.3.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -258,6 +268,7 @@ DEPENDENCIES
   capybara (~> 2.4.1)
   coffee-rails (~> 4.0.0)
   database_cleaner (~> 1.3.0)
+  devise (~> 3.3.0)
   epp (~> 1.4.0)
   fabrication (~> 2.11.3)
   faker (~> 1.3.0)
diff --git a/app/assets/stylesheets/login.css.scss b/app/assets/stylesheets/login.css.scss
new file mode 100644
index 000000000..d4bc61502
--- /dev/null
+++ b/app/assets/stylesheets/login.css.scss
@@ -0,0 +1,14 @@
+body {
+  padding-top: 40px;
+  padding-bottom: 40px;
+  background-color: #eee;
+}
+
+.form-signin {
+  max-width: 330px;
+  padding: 15px;
+  margin: 0 auto;
+  input {
+    margin-bottom: 10px;
+  }
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d83690e1b..c49d86893 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,12 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def after_sign_in_path_for(resource)
+    if resource.admin?
+      (session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s
+    else
+      (session[:user_return_to].nil?) ? client_root_path : session[:user_return_to].to_s
+    end
+  end
 end
diff --git a/app/controllers/client_controller.rb b/app/controllers/client_controller.rb
index d45b8f5ad..22b441cdd 100644
--- a/app/controllers/client_controller.rb
+++ b/app/controllers/client_controller.rb
@@ -1,5 +1,3 @@
 class ClientController < ApplicationController
-  def current_user
-    EppUser.last
-  end
+
 end
diff --git a/app/controllers/concerns/shared/common_domain.rb b/app/controllers/concerns/shared/common_domain.rb
index f30c8d385..4a54c68c0 100644
--- a/app/controllers/concerns/shared/common_domain.rb
+++ b/app/controllers/concerns/shared/common_domain.rb
@@ -2,6 +2,7 @@ module Shared::CommonDomain
   extend ActiveSupport::Concern
 
   included do
+    load_and_authorize_resource
     before_action :set_domain, only: [:show, :edit, :update, :destroy]
     before_action :verify_deletion, only: [:destroy]
   end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 000000000..75a87d73a
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,14 @@
+class SessionsController < Devise::SessionsController
+  def create
+    if Rails.env.development?
+      @user = User.find_by(username: 'gitlab') if params[:gitlab]
+      @user = User.find_by(username: 'zone') if params[:zone]
+      sign_in_and_redirect @user, :event => :authentication
+      return
+    end
+  end
+
+  def login
+    render 'layouts/login', layout: false
+  end
+end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 7f52f9220..1074c02cf 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -4,9 +4,13 @@ class Ability
   def initialize(user)
 
     # user ||= EppUser.last
-
-    can :read, DomainTransfer, transfer_to_id: user.registrar.id
-    can :approve_as_client, DomainTransfer, transfer_from_id: user.registrar.id, status: DomainTransfer::PENDING
+    if user.admin?
+      can :manage, Domain
+    else
+      can :manage, Domain, registrar_id: user.registrar.id
+      can :read, DomainTransfer, transfer_to_id: user.registrar.id
+      can :approve_as_client, DomainTransfer, transfer_from_id: user.registrar.id, status: DomainTransfer::PENDING
+    end
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index f70ea537c..910081b7a 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -3,6 +3,7 @@ class Registrar < ActiveRecord::Base
   has_many :domains
   has_many :ns_sets
   has_many :epp_users
+  has_many :users
   has_many :domain_transfers, foreign_key: 'transfer_to_id'
 
   def to_s
diff --git a/app/models/user.rb b/app/models/user.rb
index 718fff8d5..091281e24 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,7 +1,11 @@
 class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :trackable, :timeoutable
   # TODO Foreign user will get email with activation link,email,temp-password.
   # After activisation, system should require to change temp password.
   # TODO Estonian id validation
 
   belongs_to :role
+  belongs_to :registrar
 end
diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
new file mode 100644
index 000000000..3d7409479
--- /dev/null
+++ b/app/views/layouts/login.haml
@@ -0,0 +1,24 @@
+!!!
+%html{:lang => "en"}
+  %head
+    %meta{:charset => "utf-8"}/
+    %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"}/
+    = csrf_meta_tags
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
+    %link{:href => "../../favicon.ico", :rel => "icon"}/
+    %title Eesti Interneti SA - Log In
+  %body
+    .container
+      .form-signin
+        %h2.form-signin-heading.text-center Eesti Interneti SA
+        %hr
+        - if Rails.env.development?
+          = button_to 'ID card (gitlab)', 'sessions', class: 'btn btn-lg btn-primary btn-block', name: 'gitlab'
+          = button_to 'ID card (zone)', 'sessions', class: 'btn btn-lg btn-primary btn-block', name: 'zone'
+        -else
+          = button_to 'ID card', 'sessions', class: 'btn btn-lg btn-primary btn-block'
+          = button_to 'Mobile ID', 'sessions', class: 'btn btn-lg btn-primary btn-block'
diff --git a/bin/rails b/bin/rails
index b82341c98..7e12a9fe4 100755
--- a/bin/rails
+++ b/bin/rails
@@ -2,6 +2,7 @@
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError
+  puts 'no spring'
 end
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
diff --git a/bin/rake b/bin/rake
index 2e9ece45c..54d3c10d0 100755
--- a/bin/rake
+++ b/bin/rake
@@ -2,6 +2,7 @@
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError
+  puts 'no spring'
 end
 require_relative '../config/boot'
 require 'rake'
diff --git a/bin/spring b/bin/spring
index ec62a6582..adc409e83 100755
--- a/bin/spring
+++ b/bin/spring
@@ -7,9 +7,10 @@ unless defined?(Spring)
   require 'rubygems'
   require 'bundler'
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+  match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+  if match
     ENV['GEM_PATH'] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV['GEM_HOME'] = ''
+    ENV['GEM_HOME'] = nil
     Gem.paths = ENV
 
     gem 'spring', match[1]
diff --git a/config/deploy.rb b/config/deploy.rb
index 1da9b7804..4414d4ea6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -18,9 +18,9 @@ set :branch, 'master'
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
 set :shared_paths, [
-  'config/database.yml', 
-  'config/secrets.yml', 
-  'log', 
+  'config/database.yml',
+  'config/secrets.yml',
+  'log',
   'public/system'
 ]
 
@@ -42,25 +42,25 @@ end
 # Put any custom mkdir's in here for when `mina setup` is ran.
 # For Rails apps, we'll make some of the shared paths that are shared between
 # all releases.
-task :setup => :environment do
-  queue! %[mkdir -p "#{deploy_to}/shared/log"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/log"]
+task setup: :environment do
+  queue! %(mkdir -p "#{deploy_to}/shared/log")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/log")
 
-  queue! %[mkdir -p "#{deploy_to}/shared/config"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"]
+  queue! %(mkdir -p "#{deploy_to}/shared/config")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/config")
 
-  queue! %[mkdir -p "#{deploy_to}/shared/public"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public"]
+  queue! %(mkdir -p "#{deploy_to}/shared/public")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/public")
 
-  queue! %[mkdir -p "#{deploy_to}/shared/public/system"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/public/system"]
+  queue! %(mkdir -p "#{deploy_to}/shared/public/system")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/public/system")
 
-  queue! %[touch "#{deploy_to}/shared/config/database.yml"]
-  queue  %[echo "-----> Be sure to edit 'shared/config/database.yml'."]
+  queue! %(touch "#{deploy_to}/shared/config/database.yml")
+  queue  %(echo '-----> Be sure to edit 'shared/config/database.yml'.')
 end
 
-desc "Deploys the current version to the server."
-task :deploy => :environment do
+desc 'Deploys the current version to the server.'
+task deploy: :environment do
   deploy do
     # Put things that will set up an empty directory into a fully set-up
     # instance of your project.
@@ -82,4 +82,3 @@ end
 #  - http://nadarei.co/mina/tasks
 #  - http://nadarei.co/mina/settings
 #  - http://nadarei.co/mina/helpers
-
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ddf0e90cc..713b0f117 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -34,4 +34,6 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 47d3553b6..c194ef526 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -80,4 +80,7 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # TODO: Change this:
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..b6e232a8e
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( login.css )
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 000000000..e1617c587
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,259 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # config.secret_key = 'd4827f0d88c93db5c68eb43d7f86dc141ea7c44ca8f9044773265a2aa8786122c4364271960a10a956701c3c5fd4509e9c9780886200a3b772e6185271001987'
+
+  # ==> Mailer Configuration
+  # 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'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [ :email ]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # encryptor), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = '4d1b39f778c3ea5b415476ce410f337a27895181a8ccd586c60e50e0f72843d5d6ded80558ed7a4637de6b3a1504379270af6eee995fd9a329e4f4c5daa33882'
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming their account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 8..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = false
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # 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
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 000000000..e419f7794
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,60 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid email address or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index 7af6bd80f..0a3b2ccb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,7 @@ Rails.application.routes.draw do
     get 'error/:command', to: 'errors#error', defaults: { format: :xml }
   end
 
+  ## ADMIN ROUTES
   namespace(:admin) do
     resources :domains
     resources :setting_groups
@@ -19,8 +20,11 @@ Rails.application.routes.draw do
         get 'search'
       end
     end
+
+    root 'domains#index'
   end
 
+  ## CLIENT ROUTES
   namespace(:client) do
     resources :domains
     resources :domain_transfers do
@@ -34,13 +38,29 @@ Rails.application.routes.draw do
         get 'search'
       end
     end
+
+    root 'domains#index'
   end
 
+  devise_for :users
+
+  devise_scope :user do
+    resources :sessions
+    get 'logout' => 'devise/sessions#destroy'
+    get 'login' => 'sessions#login'
+  end
+
+  authenticated :user do
+    root :to => 'admin/domains#index', :as => :authenticated_root
+  end
+
+  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".
 
   # You can have the root of your site routed with "root"
-  root 'admin/domains#index'
+  # root 'admin/domains#index'
 
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'
diff --git a/db/migrate/20140925073831_add_devise_to_users.rb b/db/migrate/20140925073831_add_devise_to_users.rb
new file mode 100644
index 000000000..1346018d9
--- /dev/null
+++ b/db/migrate/20140925073831_add_devise_to_users.rb
@@ -0,0 +1,24 @@
+class AddDeviseToUsers < ActiveRecord::Migration
+  def self.up
+    change_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.inet     :current_sign_in_ip
+      t.inet     :last_sign_in_ip
+    end
+  end
+
+  def self.down
+    remove_column :users, :email
+    remove_column :users, :sign_in_count
+    remove_column :users, :current_sign_in_at
+    remove_column :users, :last_sign_in_at
+    remove_column :users, :current_sign_in_ip
+    remove_column :users, :last_sign_in_ip
+  end
+end
diff --git a/db/migrate/20140925084916_add_admin_to_users.rb b/db/migrate/20140925084916_add_admin_to_users.rb
new file mode 100644
index 000000000..e386d33dd
--- /dev/null
+++ b/db/migrate/20140925084916_add_admin_to_users.rb
@@ -0,0 +1,5 @@
+class AddAdminToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :admin, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20140925085340_add_identity_code_to_users.rb b/db/migrate/20140925085340_add_identity_code_to_users.rb
new file mode 100644
index 000000000..60faed220
--- /dev/null
+++ b/db/migrate/20140925085340_add_identity_code_to_users.rb
@@ -0,0 +1,5 @@
+class AddIdentityCodeToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :identity_code, :string
+  end
+end
diff --git a/db/migrate/20140925101927_add_registrar_to_users.rb b/db/migrate/20140925101927_add_registrar_to_users.rb
new file mode 100644
index 000000000..d560efea7
--- /dev/null
+++ b/db/migrate/20140925101927_add_registrar_to_users.rb
@@ -0,0 +1,5 @@
+class AddRegistrarToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :registrar_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cf56ac7db..9132f3ed0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20140925073734) do
+=======
+ActiveRecord::Schema.define(version: 20140925101927) do
+>>>>>>> 662806d8c92f67dda55ee91326dfb5f89ddfc230
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -190,6 +194,15 @@ ActiveRecord::Schema.define(version: 20140925073734) do
     t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "email"
+    t.integer  "sign_in_count",      default: 0,     null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.inet     "current_sign_in_ip"
+    t.inet     "last_sign_in_ip"
+    t.boolean  "admin",              default: false
+    t.string   "identity_code"
+    t.integer  "registrar_id"
   end
 
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 570cbce1b..7b4c8cb61 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -23,3 +23,6 @@ elkdata = Registrar.where(
 ).first_or_create
 
 EppUser.where(username: 'elkdata', password: '8932iods', active: true, registrar: elkdata).first_or_create
+
+User.where(username: 'gitlab', password: '12345', email: 'enquiries@gitlab.eu', admin: true, identity_code: '37810013855').first_or_create
+User.where(username: 'zone', password: '54321', email: 'info-info@zone.ee', admin: false, identity_code: '37810010085', registrar_id: zone.id).first_or_create
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index a5999a605..b3f6893a8 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,4 +1,4 @@
-if Rails.env.test?
+if Rails.env.test? || Rails.env.development?
   require 'rspec/core/rake_task'
   require 'open3'
 
diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb
index 0712b7bd2..893959039 100644
--- a/spec/models/registrar_spec.rb
+++ b/spec/models/registrar_spec.rb
@@ -5,4 +5,5 @@ describe Registrar do
   it { should have_many(:domains) }
   it { should have_many(:ns_sets) }
   it { should have_many(:epp_users) }
+  it { should have_many(:users) }
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2f99cf77d..25c1334b3 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,4 +2,5 @@ require 'rails_helper'
 
 describe User do
   it { should belong_to(:role) }
+  it { should belong_to(:registrar) }
 end