diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index 81f38396..c4f0b1d0 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -11,7 +11,6 @@
 <#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined">
 <#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined">
 <#assign predicateUri=editConfiguration.predicateUri!"undefined">
-<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!"">
 
 <#if (editConfiguration.pageData.subjectName??) >
 <h2><em>${editConfiguration.pageData.subjectName}</em></h2>
@@ -57,7 +56,7 @@
     <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel.
          These can just be ordinary links, rather than a v:input element, as in 
          addAuthorsToInformationResource.jsp. -->   
-    <a href="${showAddFormUrl}<#if (domainUri?length > 0)>&domainUri=${domainUri}</#if>" id="showAddForm" class="button green" title="${i18n().add_new_web_page}">${i18n().add_new_web_page}</a>
+    <a href="${showAddFormUrl}" id="showAddForm" class="button green" title="${i18n().add_new_web_page}">${i18n().add_new_web_page}</a>
        
     <a href="${cancelUrl}" id="returnToIndividual" class="return" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
     <img id="indicator" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" alt="${i18n().processing_indicator}"/>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
index 90effba9..8911b395 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
@@ -61,11 +61,20 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
 
         config.addFormSpecificData("baseEditWebpageUrl", path);                 
 
+        //Also add domainUri and rangeUri if they exist, adding here instead of template
+        String domainUri = (String) vreq.getParameter("domainUri");
+        String rangeUri = (String) vreq.getParameter("rangeUri");
         paramMap = new ParamMap();
         paramMap.put("subjectUri", config.getSubjectUri());
         paramMap.put("predicateUri", config.getPredicateUri());
         paramMap.put("editForm" , this.getEditForm() );
         paramMap.put("cancelTo", "manage");
+        if(domainUri != null && !domainUri.isEmpty()) {
+        	paramMap.put("domainUri", domainUri);
+        }
+        if(rangeUri != null && !rangeUri.isEmpty()) {
+        	paramMap.put("rangeUri", rangeUri);
+        }
         path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap);
 
         config.addFormSpecificData("showAddFormUrl", path);