diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
index 3b75b865c..027de990a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
@@ -8,6 +8,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
 import groovy.util.logging.Slf4j;
+import jline.internal.Log;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +68,14 @@ private User findUserOrThrowHttp404(String username) {
     @Transactional(readOnly = true)
     @GetMapping
     public List<User> getAll() {
-        return userRepository.findAll();
+        try {
+            List<User> results = userRepository.findAll(); 
+            return results;
+        }
+        catch (Exception e) {
+            Log.error("Unable to fetch users because: {}", e.getMessage());
+            throw e;
+        }
     }
 
     @Transactional(readOnly = true)
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
index 8acb53a45..e967c104d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
@@ -58,6 +58,7 @@ public class User extends AbstractAuditable {
     private String password;
 
     @Transient
+    @EqualsAndHashCode.Exclude
     private String role;
 
     @JsonIgnore
@@ -69,6 +70,13 @@ public class User extends AbstractAuditable {
     @Column(nullable = false, unique = true)
     private String username;
 
+    public String getGroupId() {
+        if (groupId == null && group != null) {
+            groupId = group.getResourceId();
+        }
+        return groupId;
+    }
+    
     public String getRole() {
         if (StringUtils.isBlank(this.role)) {
             Set<Role> roles = this.getRoles();
@@ -79,4 +87,11 @@ public String getRole() {
         }
         return this.role;
     }
+    
+    public void setGroup(Group assignedGroup) {
+        this.group = assignedGroup;
+        if (group != null) {
+            groupId = group.getResourceId();
+        }
+    }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/UserRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/UserRepository.java
index 380e8501a..0f1f7f201 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/UserRepository.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/repository/UserRepository.java
@@ -12,7 +12,6 @@
  * @author Dmitriy Kopylenko
  */
 public interface UserRepository extends JpaRepository<User, Long> {
-
     Optional<User> findByUsername(String username);
     Set<User> findByRoles_Name(String roleName);
 }