diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
index 90f50a0896..e8a72d364e 100644
--- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
@@ -105,11 +105,11 @@ mozspaces = [
   {
     name     => 'Mountain View',
     address1 => 'Mozilla',
-    address2 => '650 Castro St., Suite 300',
+    address2 => '331 E. Evelyn Ave.',
     city     => 'Mountain View',
     state    => 'CA',
     country  => 'USA',
-    postcode => '94041-2072',
+    postcode => '94041',
   },
   {
     name     => 'Paris',