diff --git a/modoboa/admin/templates/admin/newaccount.html b/modoboa/admin/templates/admin/newaccount.html
index 3e7d05790..3fda0f5fb 100644
--- a/modoboa/admin/templates/admin/newaccount.html
+++ b/modoboa/admin/templates/admin/newaccount.html
@@ -11,7 +11,7 @@
         {% for step in steps %}
         <div id="step{{ forloop.counter }}" 
              class="item{% if forloop.first %} active{% endif %}">
-          {% render_form step.form %}
+          {% if step.formtpl %}{% render_form step.form step.formtpl %}{% else %}{% render_form step.form %}{% endif %}
         </div>
         {% endfor %}
       </div>
diff --git a/modoboa/admin/templates/admin/newdomainform.html b/modoboa/admin/templates/admin/newdomainform.html
index 83346e5b7..89ba7a09b 100644
--- a/modoboa/admin/templates/admin/newdomainform.html
+++ b/modoboa/admin/templates/admin/newdomainform.html
@@ -1,6 +1,6 @@
 {% extends "common/generic_modal_form.html" %}{% load libextras %}{% block formbody %}
 {% render_field form.name %}
-{% render_field form.quota %}
+{% render_field_appended form.quota _("MB") %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
 {% endblock %}
diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py
index 56384c955..a12bb12ae 100644
--- a/modoboa/admin/views.py
+++ b/modoboa/admin/views.py
@@ -361,7 +361,8 @@ def newaccount(request, tplname='admin/newaccount.html'):
                      new_args=[request.user])
     cwizard.add_step(AccountFormMail, _("Mail"),
                      [dict(classes="btn-primary submit", label=_("Create")),
-                      dict(classes="btn-inverse prev", label=_("Previous"))])
+                      dict(classes="btn-inverse prev", label=_("Previous"))],
+                     formtpl="admin/mailform.html")
 
     if request.method == "POST":
         retcode, data = cwizard.validate_step(request)
diff --git a/modoboa/lib/formutils.py b/modoboa/lib/formutils.py
index f2d44dced..be9fa07be 100644
--- a/modoboa/lib/formutils.py
+++ b/modoboa/lib/formutils.py
@@ -14,8 +14,9 @@ class CreationWizard(object):
         self.steps = []
         self.done_cb = done_cb
 
-    def add_step(self, cls, title, buttons, new_args=None):
-        self.steps += [dict(cls=cls, title=title, buttons=buttons, new_args=new_args)]
+    def add_step(self, cls, title, buttons, formtpl=None, new_args=None):
+        self.steps += [dict(cls=cls, title=title, buttons=buttons, 
+                            formtpl=formtpl, new_args=new_args)]
 
     def create_forms(self, data=None):
         for step in self.steps: