diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index dba08c717..ab4a9028a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -93,7 +93,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
         
         if (PolicyHelper.isAuthorizedForActions(vreq, new EditIndividuals())) {
 
-            map.put("formAction", UrlBuilder.getUrl("/edit/editRequestDispatch.jsp"));
+            map.put("formAction", UrlBuilder.getUrl("/editRequestDispatch.jsp"));
             
             WebappDaoFactory wadf = vreq.getFullWebappDaoFactory();
             
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
index 63a1efa99..3fba72035 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
@@ -435,6 +435,15 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	return statementDisplay;
     }
     
+    //Used for deletion in case there's a specific template to be employed
+    public String getDeleteTemplate() {
+    	String templateName = vreq.getParameter("templateName");
+    	if(templateName == null || templateName.isEmpty()) {
+    		templateName = "propStatement-default.ftl";
+    	}
+    	return templateName;
+    }
+    
     //Retrieves data propkey from parameter and gets appropriate data value
     private String getDataLiteralValuesFromParameter() {
     	String dataValue = null;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
index 954a6215e..da89f8caa 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
@@ -23,7 +23,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
     
     private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class); 
     
-    private static final String EDIT_PATH = "edit/editRequestDispatch.jsp";
+    private static final String EDIT_PATH = "editRequestDispatch";
 
     private final Map<String, String> data;
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index c13d5545b..1d0bcbce6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -46,7 +46,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     
     private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class);      
     private static final String TYPE = "object";
-    private static final String EDIT_PATH = "edit/editRequestDispatch.jsp";
+    private static final String EDIT_PATH = "editRequestDispatch";
     private static final String IMAGE_UPLOAD_PATH = "/uploadImages";
     
     private static final String END_DATE_TIME_VARIABLE = "dateTimeEnd";
diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl
index b290d8f1f..3d27969ea 100644
--- a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl
@@ -51,7 +51,7 @@ $(document).ready(function() {
     <form id="autoCompleteDatapropForm" class="editForm" action="${submitUrl}"  role="autocomplete">
     
     <#if predicate.offerCreateNewOption >
-        <#assign var="createNewUrl = "/edit/editRequestDispatch.jsp?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create >
+        <#assign var="createNewUrl = "/editRequestDispatch?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create >
     </#if>
     
     <#if predicate.publicDescription?has_content >       
diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index b52bfde4e..5531e3090 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -6,15 +6,15 @@
     <#assign toBeDeletedClass = "objProp" />
 </#if>
 
+<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 <#assign statement = editConfiguration.statementDisplay />
-
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
     <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
     
     <p class="toBeDeleted ${toBeDeletedClass}">
         <#if editConfiguration.objectProperty = true>
-            <#if statement.object?has_content>
-                <#include "propStatement-default.ftl" />
+            <#if statement?has_content>
+                <#include deletionTemplateName />
             </#if>
         <#else>
             ${statement.dataValue}