diff --git a/db/schema.rb b/db/schema.rb
index a34b0c750..f35a9555d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -953,7 +953,7 @@ ActiveRecord::Schema.define(version: 20150519144118) do
     t.text     "crt"
     t.string   "type"
     t.string   "registrant_ident"
-    t.string   "encrypted_password",  default: ""
+    t.string   "encrypted_password",  default: "", null: false
     t.datetime "remember_created_at"
     t.integer  "failed_attempts",     default: 0,  null: false
     t.datetime "locked_at"
diff --git a/spec/fabricators/admin_user_fabricator.rb b/spec/fabricators/admin_user_fabricator.rb
index ef06405d3..2c54ad938 100644
--- a/spec/fabricators/admin_user_fabricator.rb
+++ b/spec/fabricators/admin_user_fabricator.rb
@@ -3,6 +3,7 @@
 Fabricator(:admin_user) do
   username 'gitlab'
   password 'ghyt9e4fu'
+  password_confirmation 'ghyt9e4fu'
   email 'info@gitlab.eu'
   country_code 'FI'
   roles ['admin']
@@ -11,6 +12,9 @@ end
 Fabricator(:ee_user, from: :admin_user) do
   identity_code "45002036517"
   country_code 'EE'
+  username 'user1'
+  password 'testtest'
+  password_confirmation 'testtest'
   roles ['admin']
 end
 
diff --git a/spec/features/admin/admin_user_spec.rb b/spec/features/admin/admin_user_spec.rb
index 2a08245af..427e6523f 100644
--- a/spec/features/admin/admin_user_spec.rb
+++ b/spec/features/admin/admin_user_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Admin users', type: :feature do
   before :all do
-    @admin_user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @admin_user = Fabricate(:admin_user)
   end
 
   context 'as unknown user' do
diff --git a/spec/features/admin/api_user_spec.rb b/spec/features/admin/api_user_spec.rb
index f37adc2b6..ee53888d7 100644
--- a/spec/features/admin/api_user_spec.rb
+++ b/spec/features/admin/api_user_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Api users', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
     @api_user = Fabricate(:api_user)
   end
 
diff --git a/spec/features/admin/contact_spec.rb b/spec/features/admin/contact_spec.rb
index 18fcd19cf..2d5936266 100644
--- a/spec/features/admin/contact_spec.rb
+++ b/spec/features/admin/contact_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Admin contact', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
     @contact = Fabricate(:contact, name: 'Mr John')
   end
 
diff --git a/spec/features/admin/epp_log_spec.rb b/spec/features/admin/epp_log_spec.rb
index 9aeebde2b..1bec69fe9 100644
--- a/spec/features/admin/epp_log_spec.rb
+++ b/spec/features/admin/epp_log_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'EPP log', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
     @contact = Fabricate(:contact, name: 'Mr John')
   end
 
diff --git a/spec/features/admin/invoice_spec.rb b/spec/features/admin/invoice_spec.rb
index 176ba2b66..dd6fff2f2 100644
--- a/spec/features/admin/invoice_spec.rb
+++ b/spec/features/admin/invoice_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Invoice', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
     Fabricate(:invoice)
   end
 
diff --git a/spec/features/admin/repp_log_spec.rb b/spec/features/admin/repp_log_spec.rb
index 7f1cf4af3..2b3058c2d 100644
--- a/spec/features/admin/repp_log_spec.rb
+++ b/spec/features/admin/repp_log_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Repp log', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
   end
 
   context 'as unknown user' do
diff --git a/spec/features/admin/white_ip_spec.rb b/spec/features/admin/white_ip_spec.rb
index fb84b3d30..71a69f953 100644
--- a/spec/features/admin/white_ip_spec.rb
+++ b/spec/features/admin/white_ip_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Api users', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
     @registrar = Fabricate(:registrar)
   end
 
diff --git a/spec/features/admin/zonefile_setting_spec.rb b/spec/features/admin/zonefile_setting_spec.rb
index afcdc2a7c..a335be69c 100644
--- a/spec/features/admin/zonefile_setting_spec.rb
+++ b/spec/features/admin/zonefile_setting_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Zonefile settings', type: :feature do
   before :all do
-    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @user = Fabricate(:admin_user)
   end
 
   context 'as unknown user' do
diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb
index 20ff66a38..1419b2f2c 100644
--- a/spec/features/sessions_spec.rb
+++ b/spec/features/sessions_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 feature 'Sessions', type: :feature do
   before :all do
-    Fabricate(:ee_user)
+    @user = Fabricate(:ee_user)
     @registrar1 = Fabricate(:registrar1)
     @registrar2 = Fabricate(:registrar2)
     Fabricate.times(2, :domain, registrar: @registrar1)
@@ -11,9 +11,8 @@ feature 'Sessions', type: :feature do
 
   scenario 'Admin logs in' do
     visit root_path
-    page.should have_button('ID card (user1)')
 
-    click_on 'ID card (user1)'
+    sign_in @user
     page.should have_text('Welcome!')
 
     uri = URI.parse(current_url)
diff --git a/spec/models/admin_user_spec.rb b/spec/models/admin_user_spec.rb
index 5769cabd4..d24ca24c5 100644
--- a/spec/models/admin_user_spec.rb
+++ b/spec/models/admin_user_spec.rb
@@ -12,9 +12,11 @@ describe AdminUser do
       @user.errors.full_messages.should match_array([
         "Country code is missing",
         "Email Email is missing",
+        "Email Email is missing",
         "Password Password is missing",
-        "Username Username is missing",
-        "Roles is missing"
+        "Password Password is missing",
+        "Roles is missing",
+        "Username Username is missing"
       ])
     end
 
diff --git a/spec/support/feature.rb b/spec/support/feature.rb
index 247a362ad..5b6ab730f 100644
--- a/spec/support/feature.rb
+++ b/spec/support/feature.rb
@@ -1,7 +1,17 @@
 module Feature
   def sign_in(user)
     visit '/admin/logout'
-    click_on 'ID card (user1)' if user.username == 'user1'
+
+    if user.username == 'user1'
+      fill_in 'admin_user_username', with: 'user1' 
+      fill_in 'admin_user_password', with: 'testtest'
+    end
+    if user.username == 'gitlab'
+      fill_in 'admin_user_username', with: 'gitlab' 
+      fill_in 'admin_user_password', with: 'ghyt9e4fu'
+    end
+
+    click_on 'Log in'
   end
 end