Better integration with the credentials plugin