diff --git a/webapp/web/edit/editRequestDispatch.jsp b/webapp/web/edit/editRequestDispatch.jsp
index c56594ea4..3beb8e258 100644
--- a/webapp/web/edit/editRequestDispatch.jsp
+++ b/webapp/web/edit/editRequestDispatch.jsp
@@ -24,7 +24,52 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <vitro:confirmAuthorization />
 
 <%
-	
+    HashMap<String,String> jspFormToGenerator = new HashMap<String,String>();
+    HashMap<String,String> map = jspFormToGenerator;   
+    //vitro forms:
+        map.put("autoCompleteDatapropForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AutoCompleteDatapropForm");
+        map.put("autoCompleteObjPropForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AutoCompleteObjPropForm");
+        map.put("datapropStmtDelete.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DatapropStmtDelete");
+        map.put("dateTimeIntervalForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeIntervalForm");
+        map.put("dateTimeValueForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueForm");
+        map.put("defaultAddMissingIndividualForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultAddMissingIndividualForm");
+        map.put("defaultDatapropForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDatapropForm");
+        map.put("defaultObjPropForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultObjPropForm");
+        map.put("newIndividualForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualForm");
+        map.put("propDelete.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PropDelete");
+        map.put("rdfsLabelForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfsLabelForm");
+
+        //vivo forms:
+
+        map.put("addAuthorsToInformationResource.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResource");
+        map.put("manageWebpagesForIndividual.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividual");
+        map.put("newIndividualForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualForm");
+        map.put("organizationHasPositionHistory.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistory");
+        map.put("personHasEducationalTraining.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining");
+        map.put("personHasPositionHistory.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistory");
+        map.put("redirectToPublication.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RedirectToPublication");
+        map.put("terminologyAnnotation.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.TerminologyAnnotation");
+        map.put("unsupportedBrowserMessage.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.UnsupportedBrowserMessage");
+
+        //vivo 2 stage role forms:
+
+        map.put("addAttendeeRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPerson");
+        map.put("addClinicalRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPerson");
+        map.put("addEditWebpageForm.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditWebpageForm");
+        map.put("addEditorRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPerson");
+        map.put("addGrantRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPerson");
+        map.put("addHeadOfRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPerson");
+        map.put("addMemberRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPerson");
+        map.put("addOrganizerRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPerson");
+        map.put("addOutreachRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachRoleToPerson");
+        map.put("addPresenterRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPerson");
+        map.put("addPublicationToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPerson");
+        map.put("addResearcherRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPerson");
+        map.put("addReviewerRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPerson");
+        map.put("addRoleToPersonTwoStage.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddRoleToPersonTwoStage");
+        map.put("addServiceProviderRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPerson");
+        map.put("addTeacherRoleToPerson.jsp", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPerson");
+
 	//Check if special model, in which case forward
 	if(request.getParameter("switchToDisplayModel") != null) {
 		//forward to Edit Request Dispatch Controller
@@ -39,6 +84,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 		String queryString = request.getQueryString();
 		response.sendRedirect(request.getContextPath() + "/editRequestDispatch?" + queryString);
 	}
+	
+	
     /*
     Decide which form to forward to, set subjectUri, subjectUriJson, predicateUri, and predicateUriJson in request.
     Also get the Individual for the subjectUri and put it in the request scope.
@@ -239,6 +286,14 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
         //case where a form was passed as a http parameter
         form = formParam;
     }
+    
+    String generator = jspFormToGenerator.get(form);
+    if( generator != null ){
+        String queryString = request.getQueryString();
+        response.sendRedirect(request.getContextPath() + "/editRequestDispatch?" + queryString);
+        return;
+    }            
+    
     request.setAttribute("form", form);
 %>
 <jsp:forward page="/edit/forms/${form}" />
diff --git a/webapp/web/edit/forms/autoCompleteDatapropForm.jsp b/webapp/web/edit/forms/autoCompleteDatapropForm.jsp
index cb1785fcc..5c88164fd 100644
--- a/webapp/web/edit/forms/autoCompleteDatapropForm.jsp
+++ b/webapp/web/edit/forms/autoCompleteDatapropForm.jsp
@@ -131,6 +131,8 @@
     <jsp:param name="useAutoComplete" value="true"/>
 </jsp:include>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <script type="text/javascript" language="javascript">
 $(this).load($(this).parent().children('a').attr('src')+" .editForm");
 
diff --git a/webapp/web/edit/forms/autoCompleteObjPropForm.jsp b/webapp/web/edit/forms/autoCompleteObjPropForm.jsp
index 772391ff2..208c3368a 100644
--- a/webapp/web/edit/forms/autoCompleteObjPropForm.jsp
+++ b/webapp/web/edit/forms/autoCompleteObjPropForm.jsp
@@ -122,6 +122,7 @@
     <jsp:param name="useTinyMCE" value="false"/>
     <jsp:param name="useAutoComplete" value="true"/>
 </jsp:include>
+<h1>JSP form, must be removed for the 1.4!</h1>
 
 <script type="text/javascript" language="javascript">
 $(this).load($(this).parent().children('a').attr('src')+" .editForm");
diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp
index 091eb28c9..ac656f96c 100644
--- a/webapp/web/edit/forms/datapropStmtDelete.jsp
+++ b/webapp/web/edit/forms/datapropStmtDelete.jsp
@@ -99,6 +99,8 @@
 
 <%      } else { %>
             <jsp:include page="${preForm}"/>
+<h1>JSP form, must be removed for the 1.4!</h1>
+
             <form action="editDatapropStmtRequestDispatch.jsp" method="get">
 			    <label for="submit"><h2>Are you sure you want to delete the following entry from <em>${propertyName}</em>?</h2></label>
                 <div class="toBeDeleted dataProp"><%=dataValue%></div>
diff --git a/webapp/web/edit/forms/dateTimeIntervalForm.jsp b/webapp/web/edit/forms/dateTimeIntervalForm.jsp
index 65d8fc805..be228901c 100644
--- a/webapp/web/edit/forms/dateTimeIntervalForm.jsp
+++ b/webapp/web/edit/forms/dateTimeIntervalForm.jsp
@@ -251,7 +251,7 @@
 %>
 
 <jsp:include page="${preForm}" />
-
+<h1>JSP form, must be removed for the 1.4!</h1>
 <h2>${titleVerb}&nbsp;date time interval for <%= subjectName %></h2>
 
 <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
diff --git a/webapp/web/edit/forms/dateTimeValueForm.jsp b/webapp/web/edit/forms/dateTimeValueForm.jsp
index b483e52c1..b36fee2d3 100644
--- a/webapp/web/edit/forms/dateTimeValueForm.jsp
+++ b/webapp/web/edit/forms/dateTimeValueForm.jsp
@@ -179,7 +179,7 @@
 <jsp:include page="${preForm}" />
 
 <h2>${titleVerb} date time value for <%= subjectName %></h2>
-
+<h1>JSP form, must be removed for the 1.4!</h1>
 <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
     
     <v:input id="dateTimeField" />
@@ -187,4 +187,4 @@
     <p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true"/></p>
 </form>
     
-<jsp:include page="${postForm}"/>
\ No newline at end of file
+<jsp:include page="${postForm}"/>
diff --git a/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp b/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
index 26ac4a2bb..b1a4ac19b 100644
--- a/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
+++ b/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
@@ -241,6 +241,7 @@
 </jsp:include>
 
 <h2>${formTitle}</h2>
+<h1>JSP form, must be removed for the 1.4!</h1>
 <form action="<c:url value="/edit/processRdfForm2.jsp"/>" ><br/>
     <v:input type="text" label="name (required)" id="name" size="30"/><br/>    
     <v:input type="submit" id="submit" value="<%=submitButtonLabel%>" cancel="true"/>
diff --git a/webapp/web/edit/forms/defaultDatapropForm.jsp b/webapp/web/edit/forms/defaultDatapropForm.jsp
index 27118bfdb..ec1fcc89a 100644
--- a/webapp/web/edit/forms/defaultDatapropForm.jsp
+++ b/webapp/web/edit/forms/defaultDatapropForm.jsp
@@ -149,6 +149,8 @@
 	<jsp:param name="useTinyMCE" value="true"/>
 </jsp:include>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <h2><%=formTitle%></h2>
 <form class="editForm" action="<c:url value="/edit/processDatapropRdfForm.jsp"/>" method="post" > <%-- see VITRO-435 Jira issue: need POST, not GET --%>
 	<c:if test="${!empty predicate.publicDescription}">
diff --git a/webapp/web/edit/forms/defaultObjPropForm.jsp b/webapp/web/edit/forms/defaultObjPropForm.jsp
index 0f29bdc10..31ba012ee 100644
--- a/webapp/web/edit/forms/defaultObjPropForm.jsp
+++ b/webapp/web/edit/forms/defaultObjPropForm.jsp
@@ -157,7 +157,7 @@
     }
 %>
 <jsp:include page="${preForm}"/>
-
+<h1>JSP form, must be removed for the 1.4!</h1>
 <h2><%=formTitle%></h2>
 
 <c:if test="${requestScope.predicate.selectFromExisting == true }">
diff --git a/webapp/web/edit/forms/newIndividualForm.jsp b/webapp/web/edit/forms/newIndividualForm.jsp
index a7b7df828..d70954a39 100644
--- a/webapp/web/edit/forms/newIndividualForm.jsp
+++ b/webapp/web/edit/forms/newIndividualForm.jsp
@@ -122,7 +122,7 @@ parameter set up by editRequestDispatch.
 <c:set var="requiredHint" value="<span class='requiredHint'> *</span>" />
 
 <jsp:include page="${preForm}" />
-
+<h1>JSP form, must be removed for the 1.4!</h1>
 <h2>Create a new ${typeName}</h2>
 
 <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp
index 5e0ed83d2..a3b1eb3cf 100644
--- a/webapp/web/edit/forms/propDelete.jsp
+++ b/webapp/web/edit/forms/propDelete.jsp
@@ -140,6 +140,8 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
 
 <jsp:include page="${preForm}"/>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <form action="editRequestDispatch.jsp" method="get">
     <label for="submit"><h2>Are you sure you want to delete the following entry from <em>${propertyName}</em>?</h2></label>
     <div class="toBeDeleted objProp">${statementDisplay}</div>
diff --git a/webapp/web/edit/forms/rdfsLabelForm.jsp b/webapp/web/edit/forms/rdfsLabelForm.jsp
index 0a79d46bd..8b62b8491 100644
--- a/webapp/web/edit/forms/rdfsLabelForm.jsp
+++ b/webapp/web/edit/forms/rdfsLabelForm.jsp
@@ -163,6 +163,8 @@
     <jsp:param name="useTinyMCE" value="false"/>
 </jsp:include>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <h2><%= title %></h2>
 <form action="<c:url value="/edit/processDatapropRdfForm.jsp"/>" >
     <v:input type="text" id="label" size="30" />