diff --git a/app/models/game.rb b/app/models/game.rb
index d0de23b..ac7e391 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -32,7 +32,7 @@ class Game < ActiveRecord::Base
 
     # Set status to first turn
     # Player with the lowest card
-    self.status = 'First Play at: ' + self.lowest_card.player.user.email
+    self.status = 'First Play at: ' + self.lowest_card.player.display_name
     self.controlling_player_id = self.lowest_card.player.id
     save
   end
diff --git a/app/models/player.rb b/app/models/player.rb
index b4f406f..9485a33 100644
--- a/app/models/player.rb
+++ b/app/models/player.rb
@@ -6,11 +6,16 @@ class Player < ActiveRecord::Base
   has_many :player_cards
   has_many :plays
 
-  #TODO: soft_user will not have a user_id
-  validates :user, presence: true
+  #TODO: Note: soft_user is not associated with a user
+  #validates :user, presence: true
   validates :game, presence: true
 
   def inventory
     player_cards.where(play_id: nil).order(:value)
   end
+
+  def display_name
+    self.try(:user).try(:email) || "Guest#{self.soft_token[0..5]}"
+  end
+
 end
diff --git a/spec/features/play_now_spec.rb b/spec/features/play_now_spec.rb
index dbdad75..71e9fc6 100644
--- a/spec/features/play_now_spec.rb
+++ b/spec/features/play_now_spec.rb
@@ -22,6 +22,10 @@ feature 'Play now', :devise do
     #TODO: Remove race condition
     visit current_path
     click_button 'Start'
+    #TODO: Remove race condition
+    visit current_path
+    visit current_path
+    visit current_path
     visit current_path
     expect(page).to have_content 'Inventory'
   end