diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java
index c090db618..a3acff06b 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java
@@ -4,7 +4,6 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
 
-import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 import edu.internet2.tier.shibboleth.admin.ui.security.model.Ownable;
 import edu.internet2.tier.shibboleth.admin.ui.security.model.OwnableType;
 import lombok.EqualsAndHashCode;
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
index 7062c9ec7..821d9817d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -109,10 +108,6 @@ public String getEntityId() {
     public String getId() {
         return id;
     }
-
-    public String getGroupId() {
-        return idOfOwner == null ? Group.ADMIN_GROUP.getResourceId() : idOfOwner;
-    }
     
     public List<LogoutEndpointRepresentation> getLogoutEndpoints() {
         return this.getLogoutEndpoints(false);
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests2.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests2.groovy
index 7ce67fea1..13847472c 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests2.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests2.groovy
@@ -112,7 +112,7 @@ class JPAEntityDescriptorServiceImplTests2 extends Specification {
         def result = entityDescriptorService.createNew(entityDescriptor)
         
         then:
-        ((EntityDescriptorRepresentation)result).getGroupId() == "testingGroupBBB"
+        ((EntityDescriptorRepresentation)result).getIdOfOwner() == "testingGroupBBB"
     }
     
     @TestConfiguration
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrapTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrapTests.groovy
index 4b4761625..95eb8d09f 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrapTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrapTests.groovy
@@ -51,7 +51,7 @@ class UserBootstrapTests extends Specification {
         setup:
         shibUIConfiguration.roles = []
         shibUIConfiguration.userBootstrapResource = new ClassPathResource('/conf/1044.csv')
-        def userBootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository, userService)
+        def userBootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository, userService, groupService)
 
         when:
         userBootstrap.bootstrapUsersAndRoles(null)
@@ -65,7 +65,7 @@ class UserBootstrapTests extends Specification {
     def "bootstrap roles"() {
         setup:
         shibUIConfiguration.roles = ['ROLE_ADMIN', 'ROLE_USER']
-        def userbootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository, userService)
+        def userbootstrap = new UserBootstrap(shibUIConfiguration, userRepository, roleRepository, userService, groupService)
 
         when:
         userbootstrap.bootstrapUsersAndRoles(null)