diff --git a/admin/fixtures/initial_data.json b/admin/fixtures/initial_data.json
index 2cdb5587f..2a5cd806a 100644
--- a/admin/fixtures/initial_data.json
+++ b/admin/fixtures/initial_data.json
@@ -1 +1 @@
-[{"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [37, 33, 38, 34, 39, 35, 40, 31, 36]}}]
+[{"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [36, 37, 38, 40, 41, 42, 34, 39, 43]}}]
diff --git a/admin/views.py b/admin/views.py
index 1dba6d7bb..ee9c3ebdb 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -47,6 +47,7 @@ def good_domain(f):
 @login_required
 def domains(request):
     if not request.user.has_perm("admin.view_domains"):
+        print "redirect"
         if request.user.has_perm("admin.view_mailboxes"):
             mb = Mailbox.objects.get(user=request.user.id)
             return mailboxes(request, dom_id=mb.domain.id)
diff --git a/extensions/stats/templates/content.html b/extensions/stats/templates/content.html
index 952e4b833..47f634709 100644
--- a/extensions/stats/templates/content.html
+++ b/extensions/stats/templates/content.html
@@ -55,7 +55,7 @@ window.addEvent("domready", function() {
   }
 
   get_graph = function(evt) {
-    {% if domains %}
+    {% if admin %}
     var url = "{% url getgraph_root %}" + $("domain").value + "/";
     {% else %}
     var url = "{% url getgraph domain.id %}";
@@ -68,7 +68,7 @@ window.addEvent("domready", function() {
     new Request.JSON({url : url + "?" + p, onSuccess : getgraph_callback}).get();
   }
 
-  {% if domains %}
+  {% if admin %}
   $("domain").addEvent("change", get_graph);
   {% endif %}  
   $("period").addEvent("change", get_graph);
@@ -78,7 +78,7 @@ window.addEvent("domready", function() {
 <script type="text/javascript" src="/static/js/calendar.js"></script>
 
 <div id="selectors">
-  {% if domains %}
+  {% if admin %}
   <div id="domainbox">
     <label for="domain">{% trans "Domain:" %}</label>
     <select id="domain" name="domain">
diff --git a/extensions/stats/views.py b/extensions/stats/views.py
index 8b5a2451b..f1f912350 100644
--- a/extensions/stats/views.py
+++ b/extensions/stats/views.py
@@ -36,10 +36,11 @@ def adminindex(request):
         G.make_defaults(domain, t)
 
     return _render(request, 'stats/adminindex.html', {
-        "domains" : domains, "domain" : domain,
-        "graphs" : graph_list,
-        "periods" : periods,
-        "period" : period})
+            "admin" : True,
+            "domains" : domains,
+            "graphs" : graph_list,
+            "periods" : periods,
+            "period" : period})
 
 @login_required
 @good_domain