diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
index d2104330..43648028 100644
--- a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
@@ -10,6 +10,8 @@ var mailingAddressUtils = {
         if ( editMode != "add" ) {
             this.setStreetAddressDisplayFields();
         }
+        
+        this.setAddressFieldsIfErrors();
     },
 
     initObjectReferences: function() {
@@ -18,9 +20,16 @@ var mailingAddressUtils = {
         this.street1 = $('#streetAddressOne');
         this.street2 = $('#streetAddressTwo');
         this.streetAddress = $('#streetAddress');
+        this.errorSection = $('section#error-alert');
 
     },
     
+    setAddressFieldsIfErrors: function() {
+      if ( this.errorSection.length ) {
+          mailingAddressUtils.setStreetAddressDisplayFields();
+      }
+    },
+    
     bindEventListeners: function() {
         this.idCache = {};
         
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 5aff1c63..aebf49ab 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -893,6 +893,20 @@ local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
+local:addressLocationContext a :ConfigContext ;
+    :hasConfiguration local:addressLocationConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ;
+    :qualifiedByDomain      <http://www.w3.org/2006/vcard/ns#Address> ;
+    :qualifiedBy      vivo:GeographicLocation .
+
+local:addressLocationConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "has geographic location" ;
+    vitro:displayRankAnnot 2;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
+
 ### roles using the BFO_0000055 property ###
 
 local:bfo_0000055Context a :ConfigContext ;