diff --git a/templates/import/signup.xhtml b/templates/import/signup.xhtml
index 012ef2cfa..24dc7d595 100644
--- a/templates/import/signup.xhtml
+++ b/templates/import/signup.xhtml
@@ -26,7 +26,6 @@
               {{ signup_form.password }}
             </div>
             <div class="">
-              <div class="NB-signup-optional">Optional</div>
               {{ signup_form.email.label_tag }}
               {{ signup_form.email }}
             </div>
diff --git a/templates/social/social_page.xhtml b/templates/social/social_page.xhtml
index 787efa1ec..89c9ce4ad 100644
--- a/templates/social/social_page.xhtml
+++ b/templates/social/social_page.xhtml
@@ -103,13 +103,13 @@
                     Blurblogs
                 </div>
             </a>
-            <a class="NB-header-tab NB-following-tab {% if current_tab == "global" %}NB-active{% endif %}" href="//popular.global.{% current_domain %}">
+            <a class="NB-header-tab NB-following-tab {% if current_tab == "global" %}NB-active{% endif %}" href="//popular.global.{% current_domain strip_www=True %}">
                 <div class="NB-tab-inner">
                     <span class="NB-icon"></span>
                     Global
                 </div>
             </a>
-            <a class="NB-header-tab NB-trending-tab {% if current_tab == "popular" %}NB-active{% endif %}" href="//popular.{% current_domain %}">
+            <a class="NB-header-tab NB-trending-tab {% if current_tab == "popular" %}NB-active{% endif %}" href="//popular.{% current_domain strip_www=True %}">
                 <div class="NB-tab-inner">
                     <span class="NB-icon"></span>
                     Popular
diff --git a/utils/templatetags/utils_tags.py b/utils/templatetags/utils_tags.py
index 05d158cc9..5068d169b 100644
--- a/utils/templatetags/utils_tags.py
+++ b/utils/templatetags/utils_tags.py
@@ -11,11 +11,13 @@ from utils.user_functions import get_user
 register = template.Library()
 
 @register.simple_tag
-def current_domain(dev=False):
+def current_domain(dev=False, strip_www=False):
     current_site = Site.objects.get_current()
     domain = current_site and current_site.domain
     if dev and settings.SERVER_NAME in ["dev"] and domain:
         domain = domain.replace("www", "dev")
+    if strip_www:
+        domain = domain.replace("www.", "")
     return domain
 
 @register.simple_tag(takes_context=True)