diff --git a/README b/README
index bb4dab01d..f4a5a1c0d 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ Available components:
 Django is needed to use Modoboa (http://www.djangoproject.com/)
 
 The following external tools are provided with Modoboa:
- * Mootools version 1.3+ (http://www.mootools.net/)
- * SqueezeBox version 1.1+ (http://digitarald.de/project/squeezebox/)
- * Calendar (http://electricprism.com/aeron/calendar/)
- * Autocompleter (http://digitarald.de/project/autocompleter/)
+ * jQuery version 1.7.1 (http://www.jquery.org/)
+ * jQuery-UI 1.8+ (http://jqueryui.com/)
+ * Bootstrap, from Twitter version 2.0.2 (http://twitter.github.com/bootstrap/)
+ * Bootstrap datepicker (https://bitbucket.org/eternicode/bootstrap-datepicker)
 
diff --git a/auth/views.py b/auth/views.py
index 7647d244d..f0bdd145b 100755
--- a/auth/views.py
+++ b/auth/views.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
 from django.contrib.auth import authenticate, login, logout
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import RequestContext
diff --git a/demo/templates/demo/login_announcement.html b/demo/templates/demo/login_announcement.html
index 7513ab318..9cb8f634c 100644
--- a/demo/templates/demo/login_announcement.html
+++ b/demo/templates/demo/login_announcement.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% blocktrans %}
-<h1>Welcome to the online demo!</h1>
+<h3>Welcome to the online demo!</h3>
 <p><b>Warning:</b> the demo's concent is resetted every two hours.</p>
 <p>To try the demo, the following users are available (<i>username/password</i>): </p>
 <ul>
@@ -8,6 +8,6 @@
   <li>A domain administrator : <b>admin@demo.local/admin</b></li>
   <li>A simple user : <b>user@demo.local/user</b></li>
 </ul>
-<p>Please report any issue of give any suggestion to 
+<p>Please report any issue or give any suggestion to 
   <a href="https://groups.google.com/forum/#!forum/modoboa-users">the mailing list</a>.</p>
 {% endblocktrans %}
diff --git a/lib/templatetags/libextras.py b/lib/templatetags/libextras.py
index 40330c6cd..d2f07df29 100644
--- a/lib/templatetags/libextras.py
+++ b/lib/templatetags/libextras.py
@@ -130,10 +130,11 @@ def pagination_bar(page):
 
 @register.simple_tag
 def alert(msg, typ):
-    return """<div class="alert alert-%s">
+    t = Template("""<div class="alert alert-{{ type }}">
 <a class="close" data-dismiss="alert">×</a>
-%s
-</div>""" % (typ, msg)
+{{ msg }}
+</div>""")
+    return t.render(Context(dict(type=typ, msg=msg)))
 
 @register.simple_tag
 def render_link(linkdef, mdclass=None):
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 058c08516..ca427d2a4 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -43,12 +43,8 @@
             {% if error %}{% alert error "error" %}{% endif %}
           </div>
         </div>
-      </div>
-    </div>
-    <!--
-        {% for annoucement in annoucements %}
-        <div class="roundedbox">{{ annoucement|safe }}</div>
-        {% endfor %}
-        -->
+      </div>{% for annoucement in annoucements %}
+      <div class="offset3 span5 well">{{ annoucement|safe }}</div>
+      {% endfor %}</div>
   </body>
 </html>