diff --git a/terraform/cognito.tf b/terraform/cognito.tf
index 1d670ba1..d325ff17 100644
--- a/terraform/cognito.tf
+++ b/terraform/cognito.tf
@@ -1,5 +1,4 @@
 # TODO:
-# - custom_domain
 # - sms_configuration
 
 resource "aws_cognito_user_pool" "pool" {
@@ -14,11 +13,15 @@ resource "aws_cognito_user_pool" "pool" {
     "phone_number",
   ]
 
+  auto_verified_attributes = [
+    "email",
+  ]
+
   username_configuration {
     case_sensitive = false
   }
 
-  mfa_configuration          = "ON"
+  mfa_configuration          = "OFF"
   sms_authentication_message = "Your verification code is {####}."
 
   verification_message_template {
@@ -28,12 +31,12 @@ resource "aws_cognito_user_pool" "pool" {
     sms_message          = "Your verification code is {####}. "
   }
 
-  software_token_mfa_configuration {
-    enabled = true
-  }
+  # software_token_mfa_configuration {
+  #   enabled = true
+  # }
 
   admin_create_user_config {
-    allow_admin_create_user_only = true
+    allow_admin_create_user_only = false
 
     invite_message_template {
       email_message = "Your username is {username} and temporary password is {####}. "
diff --git a/terraform/s3.tf b/terraform/s3.tf
index 51c96c1a..a876f2e9 100644
--- a/terraform/s3.tf
+++ b/terraform/s3.tf
@@ -4,10 +4,6 @@ module "s3_bucket_files" {
 
   bucket = "${local.namespace}-files"
 
-  control_object_ownership = true
-  object_ownership         = "BucketOwnerPreferred"
-  acl                      = "public-read"
-
   block_public_acls       = true
   block_public_policy     = true
   ignore_public_acls      = true