diff --git a/app/models/ability.rb b/app/models/ability.rb
index 6d389484c..d937dda15 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -7,9 +7,9 @@ class Ability
     @user = user || User.new
     @user.roles.each { |role| send(role) } if @user.roles
 
-    if @user.roles.nil? || @user.roles.empty?
-      can :show, :dashboard
-    end
+    return if @user.roles || @user.roles.any?
+
+    can :show, :dashboard
   end
 
   def user
diff --git a/app/models/user.rb b/app/models/user.rb
index 04abe0300..4df12fab5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
 
   validate :validate_identity_code
 
-  ROLES = ['user', 'customer_service', 'admin']
+  ROLES = %w(user customer_service admin)
 
   def to_s
     username
diff --git a/config/deploy.rb b/config/deploy.rb
index f3afa7d86..2f9f509d6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -57,7 +57,6 @@ task :epppr do
   set :branch, 'master' # same as staging
 end
 
-
 # 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, [
diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb
index b7484cc4a..9e85a1809 100644
--- a/spec/features/sessions_spec.rb
+++ b/spec/features/sessions_spec.rb
@@ -19,7 +19,7 @@ feature 'Sessions', type: :feature do
     expect(page).to have_text('Welcome!')
 
     uri = URI.parse(current_url)
-    expect(uri.path).to eq(admin_root_path)
+    expect(uri.path).to eq(admin_domains_path)
 
     expect(page).to have_link('Elkdata', count: 2)
     expect(page).to have_link('Registrar OÜ', count: 2)