diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2a47b86ea..01d480d1d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  before_filter do
+  before_action do
     resource = controller_name.singularize.to_sym
     method = "#{resource}_params"
     params[resource] &&= send(method) if respond_to?(method, true)
diff --git a/app/controllers/client/domains_controller.rb b/app/controllers/client/domains_controller.rb
index 43fc3fa02..1fb462bba 100644
--- a/app/controllers/client/domains_controller.rb
+++ b/app/controllers/client/domains_controller.rb
@@ -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]
@@ -71,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
diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb
index fd850bad8..c73beb6ae 100644
--- a/app/models/domain_status.rb
+++ b/app/models/domain_status.rb
@@ -40,4 +40,15 @@ 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
+  end
 end
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