diff --git a/app/controllers/admin/reserved_domains_controller.rb b/app/controllers/admin/reserved_domains_controller.rb
index 594638ce7..430fb9d8a 100644
--- a/app/controllers/admin/reserved_domains_controller.rb
+++ b/app/controllers/admin/reserved_domains_controller.rb
@@ -3,13 +3,15 @@ class Admin::ReservedDomainsController < AdminController
 
   def index
     rd = ReservedDomain.first_or_initialize
-    @reserved_domains = rd.names.to_yaml.gsub("---\n", '')
+    rd.names = nil if rd.names.blank?
+    @reserved_domains = rd.names.to_yaml.gsub(/---.?\n/, '').gsub(/\.\.\..?\n/, '')
   end
 
   def create
     @reserved_domains = params[:reserved_domains]
 
     begin
+      params[:reserved_domains] = "---\n" if params[:reserved_domains].blank?
       names = YAML.load(params[:reserved_domains])
       fail if names == false
     rescue
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index f9bd78b79..6684d6541 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -3,6 +3,7 @@ class ReservedDomain < ActiveRecord::Base
   before_save :fill_empty_passwords
 
   def fill_empty_passwords
+    return unless names
     names.each { |k, v| names[k] = SecureRandom.hex if v.blank? }
   end