diff --git a/orchestra/contrib/services/migrations/0005_auto_20160427_1531.py b/orchestra/contrib/services/migrations/0005_auto_20160427_1531.py
new file mode 100644
index 00000000..da8c6252
--- /dev/null
+++ b/orchestra/contrib/services/migrations/0005_auto_20160427_1531.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0004_auto_20160405_1133'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='service',
+            name='periodic_update',
+            field=models.BooleanField(default=False, verbose_name='periodic update', help_text='Whether a periodic update of this service orders should be performed or not. Needed for <tt>match</tt> definitions that depend on complex model interactions, where <tt>content type</tt> model save and delete operations are not enought.'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='rate_algorithm',
+            field=models.CharField(default='orchestra.contrib.plans.ratings.step_price', verbose_name='rate algorithm', max_length=64, choices=[('orchestra.contrib.plans.ratings.step_price', 'Step price'), ('orchestra.contrib.plans.ratings.match_price', 'Match price'), ('orchestra.contrib.plans.ratings.best_price', 'Best price')], help_text='Algorithm used to interprete the rating table.<br>&nbsp;&nbsp;Step price: All rates with a quantity lower or equal than the metric are applied. Nominal price will be used when initial block is missing.<br>&nbsp;&nbsp;Match price: Only <b>the rate</b> with a) inmediate inferior metric and b) lower price is applied. Nominal price will be used when initial block is missing.<br>&nbsp;&nbsp;Best price: Produces the best possible price given all active rating lines (those with quantity lower or equal to the metric).'),
+        ),
+    ]
diff --git a/orchestra/templates/admin/orchestra/change_password.html b/orchestra/templates/admin/orchestra/change_password.html
index 58e3618f..9af7dbdb 100644
--- a/orchestra/templates/admin/orchestra/change_password.html
+++ b/orchestra/templates/admin/orchestra/change_password.html
@@ -14,6 +14,7 @@
     <p class="errornote">
     {% if adminform.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
     </p>
+    {{ adminform.form.non_field_errors }}
 {% endif %}