Credential changes
Merge fix?