Move current_user.id out of ivar