diff --git a/awsdeploy.yml b/awsdeploy.yml
index bc1b0f25..91c64c1a 100644
--- a/awsdeploy.yml
+++ b/awsdeploy.yml
@@ -75,14 +75,34 @@ Resources:
             - !Ref SecretKey
             - |+
 
+            - sudo tee -a /env.list <<< EMAIL_USE_TLS=
+            - !Ref EMailUseTSL
+            - |+
+
+            - sudo tee -a /env.list <<< EMAIL_HOST=
+            - !Ref EMailHost
+            - |+
+
+            - sudo tee -a /env.list <<< EMAIL_PORT=
+            - !Ref EMailHostPort
+            - |+
+
+            - sudo tee -a /env.list <<< EMAIL_HOST_USER=
+            - !Ref EMailHostUser
+            - |+
+
+            - sudo tee -a /env.list <<< EMAIL_HOST_PASSWORD=
+            - !Ref EMailHostPassword
+            - |+
+
+            - |
+              sudo docker pull doccano/doccano:latest
             - |
               set -a
             - |
               source /env.list
             - |
               set +a
-            - |
-              sudo docker pull doccano/doccano:latest
             - >
               sudo docker run -d --name doccano --env-file /env.list -p 80:8000
               doccano/doccano:latest
@@ -195,6 +215,7 @@ Parameters:
     ConstraintDescription: must be the name of an existing EC2 KeyPair.
   AdminUserName:
     Description: The admin account user name
+    Default: 'admin'
     Type: String
     MinLength: 1
     MaxLength: 16
@@ -224,6 +245,37 @@ Parameters:
     Description: Secret key for Django
     Type: String
     AllowedPattern: '^[a-zA-Z0-9]*$'
+  EMailUseTSL:
+    Default: 'False'
+    AllowedValues:
+      - 'False'
+      - 'True'
+    Description: SMTP will use TSL
+    Type: String
+    AllowedPattern: '^[a-zA-Z0-9]*$'
+  EMailHost:
+    Description: SMTP Host
+    Type: String
+    AllowedPattern: '^[\w-]+(\.[\w-]+)*(\.[a-z]{2,})$'
+  EMailHostUser:
+    Description: SMTP Host User
+    Type: String
+    MinLength: 1
+    MaxLength: 25
+    AllowedPattern: '^[a-zA-Z0-9][a-zA-Z0-9]{1,25}$'
+  EMailHostPassword:
+    Description: SMTP Host User password
+    Type: String
+    NoEcho: true
+    MinLength: 0
+    MaxLength: 60
+    AllowedPattern: '^\p{Graph}+$'
+  EMailHostPort:
+    Description: SMTP Port
+    Type: String
+    MinLength: 1
+    MaxLength: 5
+    AllowedPattern: '^\d+$'
 Outputs:
   PublicDNS:
     Value: !GetAtt