diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
index 9fd240e4e..742160087 100755
--- a/r2/r2/lib/app_globals.py
+++ b/r2/r2/lib/app_globals.py
@@ -284,12 +284,13 @@ class Globals(object):
 
         self.REDDIT_MAIN = bool(os.environ.get('REDDIT_MAIN'))
 
-        self.origin = "http://" + (self.domain_prefix + "." if self.domain_prefix else "") + self.domain
+        origin_prefix = self.domain_prefix + "." if self.domain_prefix else ""
+        self.origin = "http://" + origin_prefix + self.domain
         self.secure_domains = set([urlparse(self.payment_domain).netloc])
         if self.https_endpoint:
             self.secure_domains.add(urlparse(self.https_endpoint).netloc)
 
-        self.trusted_origins = [self.origin, self.https_endpoint] + ['http://' + cname for cname in self.authorized_cnames]
+        self.trusted_origins = [self.origin, self.https_endpoint] + ['http://' + origin_prefix + cname for cname in self.authorized_cnames]
 
         # load the unique hashed names of files under static
         static_files = os.path.join(self.paths.get('static_files'), 'static')