diff --git a/mayan/apps/common/models.py b/mayan/apps/common/models.py
index b79c1d5117..0e64de7657 100644
--- a/mayan/apps/common/models.py
+++ b/mayan/apps/common/models.py
@@ -17,14 +17,13 @@ class AnonymousUserSingleton(SingletonModel):
         return ugettext('Anonymous user')
 
     class Meta:
-        verbose_name = _(u'anonymous user')
-        verbose_name_plural = _(u'anonymous user')
+        verbose_name = verbose_name_plural = _(u'Anonymous user')
 
 
 class AutoAdminSingleton(SingletonModel):
-    account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'account'))
-    password = models.CharField(null=True, blank=True, verbose_name=_(u'password'), max_length=128)
-    password_hash = models.CharField(null=True, blank=True, verbose_name=_(u'password hash'), max_length=128)
+    account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'Account'))
+    password = models.CharField(null=True, blank=True, verbose_name=_(u'Password'), max_length=128)
+    password_hash = models.CharField(null=True, blank=True, verbose_name=_(u'Password hash'), max_length=128)
 
     class Meta:
-        verbose_name = verbose_name_plural = _(u'auto admin properties')
+        verbose_name = verbose_name_plural = _(u'Auto admin properties')
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 62c4f84320..92c63d4052 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -19,8 +19,8 @@ from django.views.generic.list import ListView
 from acls.models import AccessEntry
 from permissions.models import Permission
 
-from .forms import (ChoiceForm, UserForm, UserForm_view, LicenseForm,
-    EmailAuthenticationForm)
+from .forms import (ChoiceForm, EmailAuthenticationForm, LicenseForm,
+                    UserForm, UserForm_view)
 from .settings import LOGIN_METHOD
 
 
@@ -200,7 +200,7 @@ def current_user_edit(request):
         'main/generic_form.html', {
             'form': form,
             'next': next,
-            'title': _(u'edit current user details'),
+            'title': _(u'Edit current user details'),
         },
         context_instance=RequestContext(request))