diff --git a/templates/cognito.yaml b/templates/cognito.yaml
index 95b7f753..bb527bb7 100644
--- a/templates/cognito.yaml
+++ b/templates/cognito.yaml
@@ -60,6 +60,7 @@ Resources:
                   Name: "preferred_username"
                   Required: true
                   Mutable: true
+            UserPoolName: !Join [ '-', [ 'UserPool', !Select [0, !Split ["-CognitoIdentityPool", !Ref "AWS::StackName"]]]]
 
     CognitoUserPoolClient:
         Type: AWS::Cognito::UserPoolClient