diff --git a/admin/views.py b/admin/views.py
index d284db567..1dba6d7bb 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -51,7 +51,7 @@ def domains(request):
             mb = Mailbox.objects.get(user=request.user.id)
             return mailboxes(request, dom_id=mb.domain.id)
 
-        return HttpResponseRedirect(reverse(userprefs.views.index))
+        return HttpResponseRedirect(reverse(userprefs.views.preferences))
     
     domains = Domain.objects.all()
     counters = {}
diff --git a/extensions/amavis_quarantine/main.py b/extensions/amavis_quarantine/main.py
index ef901b62a..a9190ec4a 100644
--- a/extensions/amavis_quarantine/main.py
+++ b/extensions/amavis_quarantine/main.py
@@ -42,7 +42,7 @@ def urls():
 def menu(**kwargs):
     import views
 
-    if kwargs["target"] == "user_menu_box":
+    if kwargs["target"] == "top_menu":
         return [
             {"name" : "quarantine",
              "label" : _("Quarantine"),
diff --git a/extensions/postfix_autoreply/main.py b/extensions/postfix_autoreply/main.py
index 60f316992..6f4d6cb26 100644
--- a/extensions/postfix_autoreply/main.py
+++ b/extensions/postfix_autoreply/main.py
@@ -48,7 +48,7 @@ def urls():
 def menu(**kwargs):
     import views
 
-    if kwargs["target"] != "user_menu_bar":
+    if kwargs["target"] != "uprefs_menu":
         return []
     return [
         {"name" : "autoreply",
diff --git a/extensions/stats/templates/adminindex.html b/extensions/stats/templates/adminindex.html
index 11b6ef8cd..31bba8802 100644
--- a/extensions/stats/templates/adminindex.html
+++ b/extensions/stats/templates/adminindex.html
@@ -1,6 +1,7 @@
 {% extends "nlayout.html" %}
 {% load i18n %}
 {% load admin_extras %}
+{% load stats_extra %}
 {% block html_head %}
 <style type="text/css">
   #graphcontent {
diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py
index 8757c92e7..c00d48525 100644
--- a/extensions/webmail/main.py
+++ b/extensions/webmail/main.py
@@ -52,7 +52,7 @@ def urls():
 def menu(**kwargs):
     import views
 
-    if kwargs["target"] != "user_menu_box":
+    if kwargs["target"] != "top_menu":
         return []
     return [
         {"name" : "webmail",
diff --git a/lib/authbackends.py b/lib/authbackends.py
index e5a9af7b0..5a468692f 100644
--- a/lib/authbackends.py
+++ b/lib/authbackends.py
@@ -16,7 +16,7 @@ class SimpleBackend:
             mb = Mailbox.objects.get(full_address=username)
         except Exception:
             return None
-        if not check_password(password, mb.password):
+        if not _check_password(password, mb.password):
             return None
         return user
 
@@ -26,7 +26,7 @@ class SimpleBackend:
         except User.DoesNotExist:
             return None
 
-def check_password(password, crypted):
+def _check_password(password, crypted):
     scheme = parameters.get_admin("admin", "PASSWORD_SCHEME")
     if scheme == "crypt":
         return crypt.crypt(password, crypted) == crypted
diff --git a/templates/nlayout.html b/templates/nlayout.html
index 97e1f9c05..e63fe9efb 100644
--- a/templates/nlayout.html
+++ b/templates/nlayout.html
@@ -25,7 +25,7 @@
       <div class="left" style="width: 50%">
         <ul>
           {% loadextmenu user %}
-          {% uprefs_menu user %}
+          {% options_menu user %}
 
           {% if user.is_superuser or perms.admin.view_domain %}
           <li class="dropdown topdropdown">
diff --git a/templates/userprefs/header.html b/templates/userprefs/header.html
deleted file mode 100644
index e7fbcdcb8..000000000
--- a/templates/userprefs/header.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "nlayout.html" %}
-{% load i18n %}
-{% block html_head %}
-<script src="/static/js/calendar.js" type="text/javascript"></script>
-<script src="/static/js/preferences.js" type="text/javascript"></script>
-<link rel="stylesheet" type="text/css" href="/static/stylesheets/calendar.css" />
-{% endblock %}
-{% block middletitle %}{% trans "General" %}{% endblock %}
-{% block content %}
-<div id="subcontent">
-{% block subcontent %}{% endblock %}
-</div>
-{% endblock %}
diff --git a/templates/userprefs/index.html b/templates/userprefs/index.html
deleted file mode 100644
index bcf27794d..000000000
--- a/templates/userprefs/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "userprefs/header.html" %}
-{% load i18n %}
-{% block menu %}
-{% load uprefs_extras %}
-{% endblock %}
-{% block subcontent %}
-<div class="info">
-  <img src="/static/pics/info.png" border="0" />
-  {% if arm %}
-  {% trans "Your auto-reply message is activated." %}
-  {% else %}
-  {% trans "Your auto-reply message is not activated." %}
-  {% endif %}
-  
-</div>
-{% endblock %}
diff --git a/templates/userprefs/preferences.html b/templates/userprefs/preferences.html
index d19161820..1f37b97da 100644
--- a/templates/userprefs/preferences.html
+++ b/templates/userprefs/preferences.html
@@ -1,9 +1,11 @@
 {% extends "nlayout.html" %}
 {% load i18n %}
+{% load uprefs_extras %}
 {% block html_head %}
 <script src="/static/js/preferences.js" type="text/javascript"></script>
 {% endblock %}
 {% block middletitle %}{% trans "Preferences" %}{% endblock %}
+{% block menu %}{% uprefs_menu user %}{% endblock %}
 {% block content %}
 <form method="POST" action="{% url userprefs.views.savepreferences %}">
   {% include "common/parameters.html" %}
diff --git a/userprefs/forms.py b/userprefs/forms.py
index 6b73d0de9..c4dddc3c9 100644
--- a/userprefs/forms.py
+++ b/userprefs/forms.py
@@ -1,5 +1,7 @@
 from django import forms
-from mailng.lib.authbackends import check_password
+from mailng.admin.models import Mailbox
+from mailng.lib.authbackends import _check_password
+from django.contrib.auth.models import check_password
 from django.utils.translation import ugettext as _
 
 class ChangePasswordForm(forms.Form):
@@ -10,13 +12,17 @@ class ChangePasswordForm(forms.Form):
     confirmation = forms.CharField(label=_("Confirmation"), 
                                    widget=forms.PasswordInput)
 
-    def __init__(self, mb, *args, **kwargs):
+    def __init__(self, target, *args, **kwargs):
         super(ChangePasswordForm, self).__init__(*args, **kwargs)
-        self.mbox = mb
+        self.target = target
 
     def clean_oldpassword(self):
-        if not check_password(self.cleaned_data["oldpassword"], 
-                              self.mbox.password):
+        if not isinstance(self.target, Mailbox):
+            func = check_password
+        else:
+            func = _check_password
+        if not func(self.cleaned_data["oldpassword"], 
+                    self.target.password):
             raise forms.ValidationError(_("Old password mismatchs"))
         return self.cleaned_data["oldpassword"]
 
diff --git a/userprefs/templatetags/uprefs_extras.py b/userprefs/templatetags/uprefs_extras.py
index f1ca0f19e..cf2138b45 100644
--- a/userprefs/templatetags/uprefs_extras.py
+++ b/userprefs/templatetags/uprefs_extras.py
@@ -8,7 +8,7 @@ from mailng.lib import events
 register = template.Library()
 
 @register.simple_tag
-def uprefs_menu(user):
+def options_menu(user):
     entries = [
         {"name"  : "userprefs",
          "img"   : "/static/pics/user.png",
@@ -30,14 +30,23 @@ def uprefs_menu(user):
          },
         ]
     entries[0]["menu"] += events.raiseQueryEvent("UserMenuDisplay", 
-                                                 target="user_menu_bar")
+                                                 target="options_menu")
+
+    return render_to_string('common/menulist.html', 
+                            {"entries" : entries, "user" : user})
+
+@register.simple_tag
+def uprefs_menu(user):
+    entries = []
+    entries += events.raiseQueryEvent("UserMenuDisplay", 
+                                      target="uprefs_menu")
 
     return render_to_string('common/menulist.html', 
                             {"entries" : entries, "user" : user})
 
 @register.simple_tag
 def loadextmenu(user):
-    menu = events.raiseQueryEvent("UserMenuDisplay", target="user_menu_box", 
+    menu = events.raiseQueryEvent("UserMenuDisplay", target="top_menu", 
                                   user=user)
     return render_to_string('common/menulist.html', 
                             {"entries" : menu, "user" : user})
diff --git a/userprefs/views.py b/userprefs/views.py
index f3b2bb253..799de43ec 100644
--- a/userprefs/views.py
+++ b/userprefs/views.py
@@ -15,18 +15,23 @@ from mailng.admin.models import Mailbox
 
 @login_required
 def index(request):
-    mb = Mailbox.objects.get(user=request.user.id)
-    return _render(request, "userprefs/index.html", {})
+    return HttpResponseRedirect(reverse(preferences))
 
 @login_required
 def changepassword(request):
-    mb = Mailbox.objects.get(user=request.user.id)
+    if request.user.id == 1:
+        target = request.user
+    else:
+        target = Mailbox.objects.get(user=request.user.id)
     error = None
     if request.method == "POST":
-        form = ChangePasswordForm(mb, request.POST)
+        form = ChangePasswordForm(target, request.POST)
         if form.is_valid():
-            mb.password = crypt_password(request.POST["confirmation"])
-            mb.save()
+            if request.user.id != 1:                
+                target.password = crypt_password(request.POST["confirmation"])
+            else:
+                target.set_password(request.POST["confirmation"])
+            target.save()
             ctx = _ctx_ok("")
             return HttpResponse(simplejson.dumps(ctx), 
                                 mimetype="application/json")
@@ -35,7 +40,7 @@ def changepassword(request):
                 })
         return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
 
-    form = ChangePasswordForm(mb)
+    form = ChangePasswordForm(target)
     return render_to_response('userprefs/chpassword.html', {
             "form" : form
             })