diff --git a/app/models/person.rb b/app/models/person.rb
index eb07f1b6..74f7fe78 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -67,7 +67,8 @@ class Person < ActiveRecord::Base
 
   def set_public_name
     if public_name.blank?
-      self.public_name = "#{first_name} #{last_name}"
+      self.public_name = ""
+      self.public_name = "#{first_name} #{last_name}" if !first_name.blank? && !last_name.blank?
     end
   end