diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 0cbf3cc8..66f81cd9 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -153,7 +153,7 @@
  
   <!--  vivo specific, must appear before other policies -->
   <listener>
-    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.VivoPolicySetup</listener-class>
+    <listener-class> edu.cornell.mannlib.vivo.auth.policy.VivoPolicy$Setup</listener-class>
   </listener>
   
   <listener>
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java b/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java
new file mode 100644
index 00000000..b79054c0
--- /dev/null
+++ b/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java
@@ -0,0 +1,93 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vivo.auth.policy;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.BasicPolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.DefaultInconclusivePolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropStmt;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropStmt;
+
+public class VivoPolicy extends DefaultInconclusivePolicy{
+	private static final Log log = LogFactory.getLog(VivoPolicy.class);
+
+	private static String AUTHORSHIP_FROM_PUB =  "http://vivoweb.org/ontology/core#informationResourceInAuthorship"; 
+	private static String AUTHORSHIP_FROM_PERSON =  "http://vivoweb.org/ontology/core#authorInAuthorship";
+	@Override
+	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+			RequestedAction whatToAuth) {
+
+		if( whatToAuth instanceof DropObjectPropStmt ){
+			DropObjectPropStmt dops = (DropObjectPropStmt)whatToAuth;
+			
+			/* Do not offer the user the option to delete so they will use the custom form instead */ 
+			/* see issue NIHVIVO-739 */
+			if( AUTHORSHIP_FROM_PUB.equals( dops.getUriOfPredicate() )) {
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+						"Use the custom edit form for core:informationResourceInAuthorship");
+			}
+			
+			if( AUTHORSHIP_FROM_PERSON.equals( dops.getUriOfPredicate() )) {
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+						"Use the custom edit form for core:authorInAuthorship");
+			}
+			 
+			if( "http://vivoweb.org/ontology/core#linkedAuthor".equals( dops.getUriOfPredicate())){
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+					"Use the custom edit form for on information resource to edit authors.");
+			}
+			
+			if( "http://vivoweb.org/ontology/core#linkedInformationResource".equals( dops.getUriOfPredicate())){
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+					"Use the custom edit form for on information resource to edit authors.");
+			}			
+		}
+		if( whatToAuth instanceof AddObjectPropStmt ){
+			AddObjectPropStmt aops = (AddObjectPropStmt)whatToAuth;
+			if( "http://vivoweb.org/ontology/core#linkedAuthor".equals( aops.getUriOfPredicate())){
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+					"Use the custom edit form for on information resource to edit authors.");
+			}
+			
+			if( "http://vivoweb.org/ontology/core#linkedInformationResource".equals( aops.getUriOfPredicate())){
+				return new BasicPolicyDecision(Authorization.UNAUTHORIZED, 
+					"Use the custom edit form for on information resource to edit authors.");
+			}	
+		}
+		
+		return super.isAuthorized(whoToAuth, whatToAuth);						
+	}
+
+	// ----------------------------------------------------------------------
+	// setup
+	// ----------------------------------------------------------------------
+	
+	public static class Setup implements ServletContextListener{
+		/**
+		 * Make a policy and add it to the ServletContext. The policy doesn't
+		 * use any Identifiers, so no need to add an IdentifierBundleFactory.
+		 */
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {		
+		   log.debug("Setting up VivoPolicy");
+	       ServletPolicyList.addPolicy(sce.getServletContext(), new VivoPolicy());
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent arg0) {
+			//do nothing		
+		}
+
+	}
+
+}