diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 3a5ee8c6c..5c5aa2327 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -448,10 +448,10 @@
                                            title="{% trans 'List Websites' %}"><span>{% trans "List Websites" %}</span></a>
                                     </li>
                                     <li><a href="{% url 'CreateNewDomain' %}"
-                                           title="{% trans 'Create New Domain' %}"><span>{% trans "Create New Domain" %}</span></a>
+                                           title="{% trans 'Create Sub-Domain' %}"><span>{% trans "Create Sub-Domain" %}</span></a>
                                     </li>
                                     <li><a href="{% url 'listChildDomains' %}"
-                                           title="{% trans 'List Domains' %}"><span>{% trans "List Domains" %}</span></a>
+                                           title="{% trans 'List Sub-Domains' %}"><span>{% trans "List Sub-Domains" %}</span></a>
                                     </li>
                                     {% if admin or modifyWebsite %}
                                         <li><a href="{% url 'modifyWebsite' %}"
diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py
index fda01047e..66249eb2a 100755
--- a/mailServer/mailserverManager.py
+++ b/mailServer/mailserverManager.py
@@ -518,7 +518,6 @@ class MailServerManager(multi.Thread):
             else:
                 return ACLManager.loadErrorJson()
             try:
-
                 emailDomain = Domains.objects.get(domain=selectedDomain)
             except:
                 raise BaseException('No emails exist for this domain.')