Add player_id to user
Pull from master, fix