diff --git a/docs/main/guides/autofill-credentials.mdx b/docs/main/guides/autofill-credentials.mdx
index ed88028e..500666ee 100644
--- a/docs/main/guides/autofill-credentials.mdx
+++ b/docs/main/guides/autofill-credentials.mdx
@@ -139,17 +139,21 @@ A green checkmark indicates a validation configuration whilst a yellow alert ind
 #### Other Validation Tools 
 Apple provides a [tool](https://search.developer.apple.com/appsearch-validation-tool/) that should validate the association. Note: It does seem to fail on good configurations.
 
-Branch provide a [tool](https://branch.io/resources/aasa-validator) that validates the link, content-type and JSON structure. It will show a false positive on an invalid JSON schema however.
+Branch provides a [tool](https://branch.io/resources/aasa-validator) that validates the link, content-type and JSON structure. It will show a false positive on an invalid JSON schema however.
+
+Capgo provides an [AASA tester](https://aasa-tester.capgo.app/) made for Capacitor that validates the link, content-type and JSON structure. It will help you to debug any site association issues.
 
 ### Save Credentials
 
-To control the saving of username and password credentials with the native iOS Password Manager you will need to use the [capacitor-ios-autofill-save-password](https://github.com/cuongpl/capacitor-ios-autofill-save-password) plugin:
+To control the saving of username and password credentials with the native iOS Password Manager you will need to use the [@capgo/capacitor-autofill-save-password](https://github.com/Cap-go/capacitor-autofill-save-password) plugin (which replaces the older `capacitor-ios-autofill-save-password` plugin that is no longer compatible with recent iOS versions):
 ```bash
-npm install capacitor-ios-autofill-save-password
+npm install @capgo/capacitor-autofill-save-password
 ```
 
 Your code will need to save credentials after successful login if it targets iOS (other platforms do not require this):
 ```typescript
+import { SavePassword } from '@capgo/capacitor-autofill-save-password';
+
 if (Capacitor.getPlatform() === 'ios') {
     await SavePassword.promptDialog({
         username: '[the username that was entered]',
@@ -181,6 +185,9 @@ Follow the [Android Deep Links Guide](deep-links#android-configuration) to creat
 }
 ```
 
+Or use `@capgo/capacitor-autofill-save-password` to support reading and writing passwords using the device's secure credential storage (such as the Android Keystore).
+Follow this [link](https://capgo.app/docs/plugins/autofill-save-password/) to set up Android.
+
 ## Configuration for Web
 Follow the [Deep Links Guide](deep-links#website-configuration) if you are targeting the web.