A few fixes to allow credential updates from the plugin