diff --git a/containers/backupchecks/src/backend/app/main/routes_cloud_connect.py b/containers/backupchecks/src/backend/app/main/routes_cloud_connect.py
index b3c8913..0beaeb4 100644
--- a/containers/backupchecks/src/backend/app/main/routes_cloud_connect.py
+++ b/containers/backupchecks/src/backend/app/main/routes_cloud_connect.py
@@ -31,6 +31,7 @@ def cloud_connect_accounts():
     )
 
     customers = Customer.query.filter_by(active=True).order_by(Customer.name.asc()).all()
+    customer_rows = [{"id": c.id, "name": c.name} for c in customers]
     jobs = Job.query.filter_by(archived=False).order_by(Job.job_name.asc()).all()
 
     # Attach derived fields for the template
@@ -45,7 +46,7 @@ def cloud_connect_accounts():
         "main/cloud_connect_accounts.html",
         unmatched=unmatched,
         matched=matched,
-        customers=customers,
+        customers=customer_rows,
         jobs=jobs,
     )
 
diff --git a/containers/backupchecks/src/templates/main/cloud_connect_accounts.html b/containers/backupchecks/src/templates/main/cloud_connect_accounts.html
index 149f34a..2893ee6 100644
--- a/containers/backupchecks/src/templates/main/cloud_connect_accounts.html
+++ b/containers/backupchecks/src/templates/main/cloud_connect_accounts.html
@@ -163,7 +163,7 @@
                        autocomplete="off" />
                 <datalist id="ccCustomerList">
                   {% for c in customers %}
-                  <option value="{{ c.name }}"></option>
+                  <option value="{{ c.name | e }}"></option>
                   {% endfor %}
                 </datalist>
               </div>