diff --git a/app/models/user.rb b/app/models/user.rb
index d7f56c6..dd37954 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,6 +24,10 @@ class User < ActiveRecord::Base
   has_many :permitted_domains, :through => :permissions, :source => :domain
   
   def name
+    full_name.blank? ? email : full_name
+  end
+  
+  def full_name
     "#{first_name} #{last_name}"
   end