diff --git a/admin/TODO b/admin/TODO
new file mode 100644
index 00000000..32230b6e
--- /dev/null
+++ b/admin/TODO
@@ -0,0 +1 @@
+- Blueprint pour le routage et les permissions par route
diff --git a/admin/freeposte/admin/forms.py b/admin/freeposte/admin/forms.py
index 9060a70b..4e969207 100644
--- a/admin/freeposte/admin/forms.py
+++ b/admin/freeposte/admin/forms.py
@@ -55,14 +55,8 @@ class UserReplyForm(Form):
     submit = fields.SubmitField('Update')
 
 
-class AliasCreateForm(Form):
+class AliasForm(Form):
     localpart = fields.StringField('Alias', [validators.DataRequired()])
     destination = fields.StringField('Destination')
     comment = fields.StringField('Comment')
     submit = fields.SubmitField('Create')
-
-
-class AliasEditForm(Form):
-    destination = fields.StringField('Destination', widget=widgets.TextArea())
-    comment = fields.StringField('Comment')
-    submit = fields.SubmitField('Create')
diff --git a/admin/freeposte/admin/templates/alias/create.html b/admin/freeposte/admin/templates/alias/create.html
index a4b162a6..697ebb31 100644
--- a/admin/freeposte/admin/templates/alias/create.html
+++ b/admin/freeposte/admin/templates/alias/create.html
@@ -17,8 +17,10 @@ Create alias
   {{ macros.form_field(form.submit) }}
   <script>
     $("#destination").tagsinput({
-      confirmKeys: [13, 32],
+      confirmKeys: [9, 13, 32],
+      tagClass: 'label label-primary large',
       typeahead: {
+        afterSelect: function(val) { this.$element.val(""); },
         source: {{ current_user.get_managed_addresses()|map('string')|list|tojson }}
       }
     });
diff --git a/admin/freeposte/admin/templates/alias/edit.html b/admin/freeposte/admin/templates/alias/edit.html
index 7e2e475f..e446dbf7 100644
--- a/admin/freeposte/admin/templates/alias/edit.html
+++ b/admin/freeposte/admin/templates/alias/edit.html
@@ -1,4 +1,4 @@
-{% extends "form.html" %}
+{% extends "alias/create.html" %}
 
 {% block title %}
 Edit alias
diff --git a/admin/freeposte/admin/views/aliases.py b/admin/freeposte/admin/views/aliases.py
index 1c39b2d7..1f8cc6ff 100644
--- a/admin/freeposte/admin/views/aliases.py
+++ b/admin/freeposte/admin/views/aliases.py
@@ -3,6 +3,7 @@ from flask.ext import login as flask_login
 
 import os
 import flask
+import wtforms_components
 
 
 @app.route('/alias/list/<domain_name>', methods=['GET'])
@@ -20,12 +21,10 @@ def alias_create(domain_name):
         flask.flash('Too many aliases for domain %s' % domain, 'error')
         return flask.redirect(
             flask.url_for('.alias_list', domain_name=domain.name))
-    form = forms.AliasCreateForm()
+    form = forms.AliasForm()
     if form.validate_on_submit():
-        for address in domain.users + domain.aliases:
-            if address.localpart == form.localpart.data:
-                flask.flash('Address %s is already used' % address, 'error')
-                break
+        if domain.has_address(form.localpart.data):
+            flask.flash('Address %s is already used' % address, 'error')
         else:
             alias = models.Alias(localpart=form.localpart.data, domain=domain)
             alias.destination = form.destination.data
@@ -43,7 +42,8 @@ def alias_create(domain_name):
 @flask_login.login_required
 def alias_edit(alias):
     alias = utils.get_alias(alias)
-    form = forms.AliasEditForm(obj=alias)
+    form = forms.AliasForm(obj=alias)
+    wtforms_components.read_only(form.localpart)
     if form.validate_on_submit():
         alias.destination = form.destination.data
         alias.comment = form.comment.data
@@ -52,7 +52,8 @@ def alias_edit(alias):
         flask.flash('Alias %s updated' % alias)
         return flask.redirect(
             flask.url_for('.alias_list', domain_name=alias.domain.name))
-    return flask.render_template('alias/edit.html', form=form, alias=alias)
+    return flask.render_template('alias/edit.html',
+        form=form, alias=alias, domain=alias.domain)
 
 
 @app.route('/alias/delete/<alias>', methods=['GET'])