diff --git a/app/controllers/admin/blocked_domains_controller.rb b/app/controllers/admin/blocked_domains_controller.rb
index c30b2dfb8..a21e01fd1 100644
--- a/app/controllers/admin/blocked_domains_controller.rb
+++ b/app/controllers/admin/blocked_domains_controller.rb
@@ -19,7 +19,15 @@ class Admin::BlockedDomainsController < AdminController
 
   def create
 
-    abort
+    @domain = BlockedDomain.new(blocked_domain_params)
+
+    if @domain.save
+      flash[:notice] = I18n.t('domain_added')
+      redirect_to admin_blocked_domains_path
+    else
+      flash.now[:alert] = I18n.t('failed_to_add_domain')
+      render 'new'
+    end
 
   end
 
@@ -35,7 +43,7 @@ class Admin::BlockedDomainsController < AdminController
   end
 
 
-  def blocked_params
+  def blocked_domain_params
     params.require(:blocked_domain).permit(:name)
   end
 
diff --git a/app/controllers/admin/reserved_domains_controller.rb b/app/controllers/admin/reserved_domains_controller.rb
index b0af2fb9f..319a6275c 100644
--- a/app/controllers/admin/reserved_domains_controller.rb
+++ b/app/controllers/admin/reserved_domains_controller.rb
@@ -21,7 +21,7 @@ class Admin::ReservedDomainsController < AdminController
 
   def create
 
-    @domain = ReservedDomain.new(reserved_params)
+    @domain = ReservedDomain.new(reserved_domain_params)
 
     if @domain.save
       flash[:notice] = I18n.t('domain_added')
@@ -35,7 +35,7 @@ class Admin::ReservedDomainsController < AdminController
 
   def update
 
-    if @domain.update(reserved_params)
+    if @domain.update(reserved_domain_params)
       flash[:notice] = I18n.t('domain_updated')
     else
       flash.now[:alert] = I18n.t('failed_to_update_domain')
@@ -58,7 +58,7 @@ class Admin::ReservedDomainsController < AdminController
 
   private
 
-  def reserved_params
+  def reserved_domain_params
     params.require(:reserved_domain).permit(:name, :password)
   end
 
diff --git a/app/models/blocked_domain.rb b/app/models/blocked_domain.rb
index 2a646a74f..e433aae85 100644
--- a/app/models/blocked_domain.rb
+++ b/app/models/blocked_domain.rb
@@ -1,5 +1,6 @@
 class BlockedDomain < ActiveRecord::Base
   include Versions
+validates :name, domain_name: true, uniqueness: true
 
   after_initialize -> { self.names = [] if names.nil? }
 end
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index e141ab7ee..718d90bcf 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -3,6 +3,9 @@ class ReservedDomain < ActiveRecord::Base
   before_save :fill_empty_passwords
   before_save :generate_data
   before_destroy :remove_data
+  validates :name, domain_name: true, uniqueness: true
+
+
 
 
   class << self
diff --git a/app/views/admin/reserved_domains/_form.haml b/app/views/admin/reserved_domains/_form.haml
index 2ba2431e9..ec7492659 100644
--- a/app/views/admin/reserved_domains/_form.haml
+++ b/app/views/admin/reserved_domains/_form.haml
@@ -16,7 +16,7 @@
             .col-md-4.control-label
               = f.label :password
             .col-md-7
-              = f.text_field(:password, class: 'form-control')
+              = f.text_field(:password, placeholder: t(:optional), class: 'form-control')
   .row
     .col-md-8.text-right
       = button_tag(t(:save), class: 'btn btn-primary')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bad2571e2..2e36ec69d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -932,4 +932,5 @@ en:
   expiration_remind_subject: 'The %{name} domain has expired'
   add_reserved_domain: 'Add domain to reserved list'
   add_blocked_domain: 'Add domain to blocked list'
-  edit_pw: 'Edit Pw'
\ No newline at end of file
+  edit_pw: 'Edit Pw'
+  optional: 'Optional'
\ No newline at end of file