diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index c93353c6f5b..0df5f9dec96 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -519,7 +519,7 @@ module.exports = {
       functionName
     )}LambdaPermissionCognitoUserPool${this.normalizeNameToAlphaNumericOnly(
       poolId
-    )}TriggerSource${triggerSource}`;
+    )}TriggerSource${this.normalizeNameToAlphaNumericOnly(triggerSource)}`;
   },
   getLambdaAlbPermissionLogicalId(functionName) {
     return `${this.getNormalizedFunctionName(functionName)}LambdaPermissionAlb`;
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index f0a348ca5d6..9df0306593c 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -705,9 +705,11 @@ describe('#naming()', () => {
         sdk.naming.getLambdaCognitoUserPoolPermissionLogicalId(
           'functionName',
           'Pool1',
-          'CustomMessage'
+          'PreSignUp_ExternalProvider'
         )
-      ).to.equal('FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourceCustomMessage');
+      ).to.equal(
+        'FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourcePreSignUpExternalProvider'
+      );
     });
 
     describe('#getLambdaAlbPermissionLogicalId()', () => {