diff --git a/etc/default_data.json b/etc/default_data.json
index 69f2e0163..0e5bf51a9 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -2868,7 +2868,7 @@
                 }
             ],
             "user_name": "Thierry Carrez",
-            "emails": ["thierry@openstack.org"]
+            "emails": ["thierry@openstack.org", "thierry.carrez@ubuntu.com"]
         },
         {
             "launchpad_id": "u-matt-h",
@@ -3217,11 +3217,7 @@
             "company_name": "Calxeda"
         },
         {
-            "domains": ["canonical.com"],
-            "company_name": "Canonical"
-        },
-        {
-            "domains": ["ubuntu.com"],
+            "domains": ["canonical.com", "ubuntu.com"],
             "company_name": "Canonical"
         },
         {