diff --git a/docs/overview.rst b/docs/overview.rst
index 9ac1fb14..f969c23c 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -467,6 +467,7 @@ certain sites.
 * `American Institute for Foreign Study <http://www.aifs.com.au>`_
 * `Camp America <http://campamerica.com.au>`_
 * `Code Source <http://codesource.com.au/>`_
+* `The Federation of Egalitarian Communities <http://thefec.org>`_
 
 .. _`Mezzanine Grid on djangopackages.com`: http://www.djangopackages.com/grids/g/mezzanine/
 .. _`Cartridge`: http://cartridge.jupo.org/
diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py
index df1ce87a..66b9f861 100644
--- a/mezzanine/conf/forms.py
+++ b/mezzanine/conf/forms.py
@@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs):
 
     def _init_field(self, setting, field_class, name, code=None):
         """
-        Initialize a field wether it is built with a custom name for a
+        Initialize a field whether it is built with a custom name for a
         specific translation language or not.
         """
         kwargs = {
diff --git a/mezzanine/core/forms.py b/mezzanine/core/forms.py
index 29354c52..88f276ba 100644
--- a/mezzanine/core/forms.py
+++ b/mezzanine/core/forms.py
@@ -21,11 +21,13 @@ class Html5Mixin(object):
     def __init__(self, *args, **kwargs):
         super(Html5Mixin, self).__init__(*args, **kwargs)
         if hasattr(self, "fields"):
-            # Autofocus first field
-            first_field = next(iter(self.fields.values()))
-            first_field.widget.attrs["autofocus"] = ""
+            first_field = None
 
             for name, field in self.fields.items():
+                # Autofocus first non-hidden field
+                if not first_field and not field.widget.is_hidden:
+                    first_field = field
+                    first_field.widget.attrs["autofocus"] = ""
                 if settings.FORMS_USE_HTML5:
                     if isinstance(field, forms.EmailField):
                         self.fields[name].widget.input_type = "email"
diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py
index b37b6fbc..3e1d1165 100644
--- a/mezzanine/utils/conf.py
+++ b/mezzanine/utils/conf.py
@@ -211,10 +211,10 @@ def mezzanine_settings():
             # it's in the project directory and add the path to it.
             if "NAME" in db and os.sep not in db["NAME"]:
                 db_path = os.path.join(s.get("PROJECT_ROOT", ""), db["NAME"])
-                s["DATABASES"][key]["NAME"] = db_path
+                db["NAME"] = db_path
         elif shortname == "mysql":
             # Required MySQL collation for tests.
-            s["DATABASES"][key]["TEST_COLLATION"] = "utf8_general_ci"
+            db.setdefault("TEST", {})["COLLATION"] = "utf8_general_ci"
 
 
 def real_project_name(project_name):