diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
index 9c5418e6..f0ac9b1d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddMemberRoleToPersonGenerator.java
@@ -4,12 +4,12 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaClassGroupOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 
 public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
 	
 	private static String template = "addMemberRoleToPerson.ftl";
-	private static String VCLASS_GROUP_URI = "http://vivoweb.org/ontology#vitroClassGrouporganizations";
+	private static String VCLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
 	@Override
 	String getTemplate() {
 		return template;
@@ -22,7 +22,7 @@ public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGener
 	
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {     
-        return new IndividualsViaClassGroupOptions(VCLASS_GROUP_URI)
+        return new ChildVClassesOptions(VCLASS_URI)
             .setDefaultOptionLabel( "Select one");		
 	}
 	
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
index 6ea250f4..bd6283c4 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
@@ -15,6 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalVali
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
@@ -113,7 +114,7 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
         conf.addField( new FieldVTwo().
                 setName("presentationType").
                 setValidators( list("nonempty") ).
-                setOptions( new ChildVClassesOptions(
+                setOptions( new ChildVClassesWithParent(
                         presentationClass))                                
                 );