diff --git a/app/models/player.rb b/app/models/player.rb
index f6621ef1..896aa7f3 100644
--- a/app/models/player.rb
+++ b/app/models/player.rb
@@ -15,7 +15,9 @@ class Player < ActiveRecord::Base
   end
 
   def display_name
-    self.try(:user).try(:email) || "Guest#{self.soft_token[0..5]}"
+    return user.email if self.user
+    return ("Guest" + self.soft_token)[0..9] if self.soft_token
+    return "Empty"
   end
 
   def play_hand(cards)