diff --git a/openquakeplatform/openquakeplatform/local_settings.py.template b/openquakeplatform/openquakeplatform/local_settings.py.template
index 54c2b060d..a641055e6 100644
--- a/openquakeplatform/openquakeplatform/local_settings.py.template
+++ b/openquakeplatform/openquakeplatform/local_settings.py.template
@@ -365,19 +365,22 @@ AUTH_EXEMPT_URLS = ('/$',
                     '/vulnerability/engineering_demand_csc?.*',
                     '/vulnerability/resp_var_par_csc?.*',
                     '/vulnerability/resp_var_units_csc?.*',
-                    '/taxtweb/')
+                    '/taxtweb/',
+                    '/building-class/')
 
 # Uncomment to allow open registration.
 # FIXME: there's no admin validation on new accounts.
 # REGISTRATION_OPEN = True
 
-# Uncomment to allow open registration.
+# Uncomment to allow open registration and enable EMAIL_BACKEND
+#                   (use '...console.EmailBackend' for devel purposes).
 # This setting define in how many days an account
 # must be verified by the user.
 # ACCOUNT_ACTIVATION_DAYS = 1
 
 # A valid mailserver must be configured to make open registration work.
 # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+# EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 # EMAIL_HOST = 'localhost'
 # EMAIL_PORT = 25
 # DEFAULT_FROM_EMAIL = 'info@%(hostname)s'
diff --git a/openquakeplatform/openquakeplatform/templates/includes/header.html b/openquakeplatform/openquakeplatform/templates/includes/header.html
index 691ccded7..fa2a8608f 100644
--- a/openquakeplatform/openquakeplatform/templates/includes/header.html
+++ b/openquakeplatform/openquakeplatform/templates/includes/header.html
@@ -88,7 +88,11 @@
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Sign in" %}</a>
                         <ul class="dropdown-menu">
                           <li>
+                          {% if next %}
+                            <form action="{% url "account_login" %}?next={{next}}" method="post" class="sign-in">
+                          {%else%}
                             <form action="{% url "account_login" %}" method="post" class="sign-in">
+                          {% endif %}
                             {% csrf_token %}
                               <label for="id_username">{% trans "Username" %}:</label>
                               <input id="id_username" name="username" type="text" />
diff --git a/openquakeplatform/openquakeplatform/templates/share.html b/openquakeplatform/openquakeplatform/templates/share.html
index 4375dd02f..17ffe2174 100644
--- a/openquakeplatform/openquakeplatform/templates/share.html
+++ b/openquakeplatform/openquakeplatform/templates/share.html
@@ -39,6 +39,9 @@ <h1>{% trans "OpenQuake Share" %}</h1>
               <li>
                 <a href="{% url 'vulnerability.views.list' %}">The Physical Vulnerability suite</a> allows users to explore and contribute to a comprehensive global vulnerability database that includes fragility, vulnerability, damage-to-loss functions and capacity curves for different types of structure.
               </li>
+              <li>
+                <a href="{% url 'building_class:home' %}">The Building Classification Survey tool</a> allows users to share information regarding the building stock of a given region.
+              </li>
             </ul>
 
             <b>Offline Inventory Capture Tools</b>