Changes to accommodate credentials_required