diff --git a/admin/views.py b/admin/views.py
index 6cd819801..0c67fd4c4 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -251,6 +251,7 @@ def deldlist(request):
 def identities(request, tplname='admin/identities.html'):
     accounts_list = []
     squery = request.GET.get("searchquery", None)
+    mbalias_q = Q(domain__in=request.user.get_domains())
     if squery:
         accounts = User.objects.filter(username__contains=squery)
         if squery.find('@') != -1:
@@ -258,10 +259,10 @@ def identities(request, tplname='admin/identities.html'):
             mbaliases = Alias.objects.filter(address__contains=local_part,
                                              domain__name__contains=domname)
         else:
-            mbaliases = Alias.objects.filter(address__contains=squery)
+            mbaliases = Alias.objects.filter(mbalias_q & Q(address__contains=squery))
     else:
         accounts = User.objects.all()
-        mbaliases = Alias.objects.all()
+        mbaliases = Alias.objects.filter(mbalias_q)
 
     for account in accounts:
         if request.user.can_access(account) or \
diff --git a/extensions/sievefilters/static/css/style.css b/extensions/sievefilters/static/css/style.css
index 123766e87..0876d6e33 100644
--- a/extensions/sievefilters/static/css/style.css
+++ b/extensions/sievefilters/static/css/style.css
@@ -34,11 +34,6 @@
     margin-top: 20px;
 }
 
-#filterform #id_name {
-    margin-top: 10px;
-    width: 200px;
-}
-
 #submit_container {
     width: 100%;
     position: absolute;
diff --git a/extensions/sievefilters/static/js/lib.js b/extensions/sievefilters/static/js/lib.js
index 32c301713..7f7a00004 100644
--- a/extensions/sievefilters/static/js/lib.js
+++ b/extensions/sievefilters/static/js/lib.js
@@ -231,6 +231,9 @@ function filterset_created(data) {
 }
 
 function filtersetform_cb() {
+    $("#newfiltersset").find("input").keypress(function(e) {
+        if (e.which == 13) e.preventDefault();
+    });
     $(".submit").one('click', function(e) {
         simple_ajax_form_post(e, {
             reload_on_success: false,
diff --git a/static/js/notify.js b/static/js/notify.js
index 648ab7910..c0226c3a9 100644
--- a/static/js/notify.js
+++ b/static/js/notify.js
@@ -50,7 +50,7 @@
             this.$element.append(nbox);
             if (timer != undefined) {
                 window.setTimeout(function() {
-                    $('.alert').alert('close');
+                    nbox.alert('close');
                 }, timer);
             }
             return this;
diff --git a/static/js/utils.js b/static/js/utils.js
index b0b0eb360..a227fccfe 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -40,7 +40,10 @@ function modalbox(e, css, defhref, defcb) {
 }
 
 function modalbox_autowidth(e) {
-    modalbox.apply(this, [e, {width: 'auto'}]);
+    modalbox.apply(this, [e, {
+        width: 'auto',
+        'margin-left': function() { return -($(this).width() / 2); }
+    }]);
 }
 
 /*