should we check for 'current_organization && ' ?