diff --git a/cps/config_sql.py b/cps/config_sql.py
index e940c450..c00bc213 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -276,7 +276,7 @@ def _migrate_table(session, orm_class):
             try:
                 session.query(column).first()
             except exc.OperationalError as err:
-                log.debug("%s: %s", column_name, err)
+                log.debug("%s: %s", column_name, err.args[0])
                 if column.default is not None:
                     if sys.version_info < (3, 0):
                         if isinstance(column.default.arg,unicode):
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 6cbc6a64..b760a0f7 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -30,7 +30,7 @@
     <label for="locale">{{_('Language')}}</label>
         <select name="locale" id="locale" class="form-control">
             {%  for translation in translations %}
-                <option value="{{translation}}" {% if translation|string == content.locale %}selected{% endif %} {% if new_user == 1 and loop.first %}selected{% endif %}>{{ translation.display_name }}</option>
+                <option value="{{translation}}" {% if translation|string == content.locale %}selected{% endif %} {% if new_user == 1 and loop.first %}selected{% endif %}>{{ translation.display_name|capitalize }}</option>
             {% endfor %}
         </select>
     </div>