diff --git a/apps/oauth/views.py b/apps/oauth/views.py
index fce8315f5..92c32906e 100644
--- a/apps/oauth/views.py
+++ b/apps/oauth/views.py
@@ -137,7 +137,7 @@ def facebook_connect(request):
 @login_required
 @render_to('social/social_connect.xhtml')
 def appdotnet_connect(request):
-    domain = Site.objects.get_current().domain.replace('www', 'dev')
+    domain = Site.objects.get_current().domain.replace("www", "dev")
     args = {
         "client_id": settings.APPDOTNET_CLIENTID,
         "client_secret": settings.APPDOTNET_SECRET,
diff --git a/apps/reader/views.py b/apps/reader/views.py
index aa5c46d3f..782f3e1fb 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -92,7 +92,7 @@ def dashboard(request, **kwargs):
         del request.session['import_from_google_reader']
     
     if not user.is_active:
-        url = "https://%s%s" % (Site.objects.get_current().domain,
+        url = "https://%s%s" % (Site.objects.get_current().domain.replace("www", "dev"),
                                  reverse('stripe-form'))
         return HttpResponseRedirect(url)
     
diff --git a/utils/templatetags/utils_tags.py b/utils/templatetags/utils_tags.py
index bf135325c..b3e576807 100644
--- a/utils/templatetags/utils_tags.py
+++ b/utils/templatetags/utils_tags.py
@@ -14,7 +14,7 @@ register = template.Library()
 def current_domain():
     current_site = Site.objects.get_current()
     domain = current_site and current_site.domain
-    if settings.SERVER_NAME == "dev" and domain:
+    if settings.SERVER_NAME in ["dev", "work"] and domain:
         domain = domain.replace("www", "dev")
     return domain