diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 2694af651..bdae28a09 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -15,6 +15,8 @@ class Admin::DomainsController < AdminController
   end
 
   def update
+    add_prefix_to_statuses
+
     if @domain.update(domain_params)
       flash[:notice] = I18n.t('shared.domain_updated')
       redirect_to [:admin, @domain]
@@ -36,4 +38,10 @@ class Admin::DomainsController < AdminController
       domain_statuses_attributes: [:id, :value, :description, :_destroy]
     )
   end
+
+  def add_prefix_to_statuses
+    domain_params[:domain_statuses_attributes].each do |_k, hash|
+      hash[:value] = hash[:value].prepend('server')
+    end
+  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c49d86893..01d480d1d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,12 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
+  before_action do
+    resource = controller_name.singularize.to_sym
+    method = "#{resource}_params"
+    params[resource] &&= send(method) if respond_to?(method, true)
+  end
+
   def after_sign_in_path_for(resource)
     if resource.admin?
       (session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s
diff --git a/app/controllers/client/domains_controller.rb b/app/controllers/client/domains_controller.rb
index 11386fd27..1fb462bba 100644
--- a/app/controllers/client/domains_controller.rb
+++ b/app/controllers/client/domains_controller.rb
@@ -1,7 +1,7 @@
 class Client::DomainsController < ClientController
-    load_and_authorize_resource
-    before_action :set_domain, only: [:show, :edit, :update, :destroy]
-    before_action :verify_deletion, only: [:destroy]
+  load_and_authorize_resource
+  before_action :set_domain, only: [:show, :edit, :update, :destroy]
+  before_action :verify_deletion, only: [:destroy]
 
   def index
     @q = Domain.search(params[:q]) if current_user.admin?
@@ -18,6 +18,8 @@ class Client::DomainsController < ClientController
   end
 
   def create
+    add_prefix_to_statuses
+
     @domain = Domain.new(domain_params)
     @domain.registrar = current_user.registrar
 
@@ -36,6 +38,8 @@ class Client::DomainsController < ClientController
   end
 
   def update
+    add_prefix_to_statuses
+
     if @domain.update(domain_params)
       flash[:notice] = I18n.t('shared.domain_updated')
       redirect_to [:client, @domain]
@@ -46,6 +50,16 @@ class Client::DomainsController < ClientController
     end
   end
 
+  def destroy
+    if @domain.destroy
+      flash[:notice] = I18n.t('shared.domain_deleted')
+      redirect_to client_domains_path
+    else
+      flash[:alert] = I18n.t('shared.failed_to_delete_domain')
+      redirect_to [:client, @domain]
+    end
+  end
+
   private
 
   def domain_params
@@ -61,6 +75,12 @@ class Client::DomainsController < ClientController
     )
   end
 
+  def add_prefix_to_statuses
+    domain_params[:domain_statuses_attributes].each do |_k, hash|
+      hash[:value] = hash[:value].prepend('client')
+    end
+  end
+
   def set_domain
     @domain = Domain.find(params[:id])
   end
@@ -74,6 +94,6 @@ class Client::DomainsController < ClientController
   def verify_deletion
     return if @domain.can_be_deleted?
     flash[:alert] = I18n.t('shared.domain_status_prohibits_deleting')
-    redirect_to [:admin, @domain]
+    redirect_to [:client, @domain]
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 1074c02cf..8b2accfca 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -3,10 +3,10 @@ class Ability
 
   def initialize(user)
 
-    # user ||= EppUser.last
+    user ||= User.new
     if user.admin?
       can :manage, Domain
-    else
+    elsif user.persisted?
       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
diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb
index fd850bad8..139c075bf 100644
--- a/app/models/domain_status.rb
+++ b/app/models/domain_status.rb
@@ -40,4 +40,24 @@ class DomainStatus < ActiveRecord::Base
       ]
     }
   end
+
+  class << self
+    def statuses_for_client
+      ret = []
+      STATUSES.each do |x|
+        next unless x.start_with?('client')
+        ret << x.sub('client', '')
+      end
+      ret
+    end
+
+    def statuses_for_admin
+      ret = []
+      STATUSES.each do |x|
+        next unless x.start_with?('server')
+        ret << x.sub('server', '')
+      end
+      ret
+    end
+  end
 end
diff --git a/app/views/admin/domains/form_partials/_statuses.haml b/app/views/admin/domains/form_partials/_statuses.haml
index ae8eb2f44..4623c85ed 100644
--- a/app/views/admin/domains/form_partials/_statuses.haml
+++ b/app/views/admin/domains/form_partials/_statuses.haml
@@ -15,7 +15,7 @@
           .col-md-6
             .form-group
               = status_fields.label :value
-              = status_fields.select :value, options_for_select(DomainStatus::STATUSES, status_fields.object.value), {include_blank: true}, {class: 'form-control'}
+              = status_fields.select :value, options_for_select(DomainStatus.statuses_for_admin, status_fields.object.value.sub('server', '')), {include_blank: true}, {class: 'form-control'}
           .col-md-6
             .form-group
               = status_fields.label :description
diff --git a/app/views/client/domains/form_partials/_statuses.haml b/app/views/client/domains/form_partials/_statuses.haml
index ae8eb2f44..113dfd3b4 100644
--- a/app/views/client/domains/form_partials/_statuses.haml
+++ b/app/views/client/domains/form_partials/_statuses.haml
@@ -15,7 +15,7 @@
           .col-md-6
             .form-group
               = status_fields.label :value
-              = status_fields.select :value, options_for_select(DomainStatus::STATUSES, status_fields.object.value), {include_blank: true}, {class: 'form-control'}
+              = status_fields.select :value, options_for_select(DomainStatus.statuses_for_client, status_fields.object.value.sub('client', '')), {include_blank: true}, {class: 'form-control'}
           .col-md-6
             .form-group
               = status_fields.label :description
diff --git a/app/views/layouts/client.haml b/app/views/layouts/client.haml
index c6449a370..72baf4318 100644
--- a/app/views/layouts/client.haml
+++ b/app/views/layouts/client.haml
@@ -9,7 +9,7 @@
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     %link{href: "../../favicon.ico", rel: "icon"}/
-    %title EPP Client
+    %title= t('shared.eedirekt')
   %body
     / Static navbar
     .navbar.navbar-inverse.navbar-static-top{role: "navigation"}
@@ -20,7 +20,7 @@
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          = link_to 'EPP Client', client_domains_path, class: 'navbar-brand'
+          = link_to t('shared.eedirekt'), client_domains_path, class: 'navbar-brand'
         .navbar-collapse.collapse
           %ul.nav.navbar-nav
             %li.dropdown.active
@@ -44,8 +44,9 @@
                   = link_to t('shared.check'), '#'
                 %li
                   = link_to t('shared.register'), '#'
-            %li
-              = link_to 'Admin', '/'
+            - if current_user.admin?
+              %li
+                = link_to 'Admin', admin_root_path
           %ul.nav.navbar-nav.navbar-right
             %li= link_to t('shared.log_out'), '/logout'
         / /.nav-collapse