diff --git a/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf b/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf
index b33dc980..796cc1b6 100644
--- a/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf
+++ b/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf
@@ -50,7 +50,7 @@ resource "google_sql_user" "service-account" {
   for_each = toset(var.data_eng_principals)
   project  = module.project.project_id
   # Omit the .gserviceaccount.com suffix in the email
-  name     = regex("(.+)(gserviceaccount)", module.service-account-sql.email)[0]
+  name     = regex("(.+)(.gserviceaccount)", module.service-account-sql.email)[0]
   instance = module.db.name
   type     = "CLOUD_IAM_SERVICE_ACCOUNT"
 }
diff --git a/blueprints/data-solutions/cloudsql-multiregion/outputs.tf b/blueprints/data-solutions/cloudsql-multiregion/outputs.tf
index 6d6d5178..69840195 100644
--- a/blueprints/data-solutions/cloudsql-multiregion/outputs.tf
+++ b/blueprints/data-solutions/cloudsql-multiregion/outputs.tf
@@ -38,8 +38,8 @@ output "demo_commands" {
   description = "Demo commands."
   value = {
     "01_ssh"             = "gcloud compute ssh ${module.test-vm.instance.name} --project ${module.project.name} --zone ${var.regions.primary}-b"
-    "02_cloud_sql_proxy" = "cloud_sql_proxy -instances=${module.db.connection_name}=tcp:5432 &"
-    "03_psql"            = "psql 'host=127.0.0.1 port=5432 sslmode=disable dbname=${var.postgres_database} user=postgres'"
+    "02_cloud_sql_proxy" = "cloud_sql_proxy -enable_iam_login -instances=${module.db.connection_name}=tcp:5432 &"
+    "03_psql"            = "psql 'host=127.0.0.1 port=5432 sslmode=disable dbname=${var.postgres_database} user=postgres password=PASSWORD'"
   }
 }