diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 826b1f542..a86e42a39 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -252,7 +252,7 @@ class EndToEndTestCase(unittest.TestCase):
                 OR (rolname = 'kind_deleted' AND NOT rolcanlogin);
         """
         self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2, 
-            "PostgresTeam change not reflected in database", 10, 5)
+            "Database role of replaced member in PostgresTeam not renamed", 10, 5)
 
         # re-add additional member and check if the role is renamed back
         self.k8s.api.custom_objects_api.patch_namespaced_custom_object(
@@ -275,7 +275,7 @@ class EndToEndTestCase(unittest.TestCase):
                 OR (rolname = 'tester_deleted' AND NOT rolcanlogin);
         """
         self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2, 
-            "PostgresTeam change not reflected in database", 10, 5)
+            "Database role of recreated member in PostgresTeam not renamed back to original name", 10, 5)
 
         # revert config change
         revert_resync = {
diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go
index 28a55af4e..6acecc38d 100644
--- a/pkg/cluster/util.go
+++ b/pkg/cluster/util.go
@@ -256,14 +256,12 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) {
 
 	token, err := c.oauthTokenGetter.getOAuthToken()
 	if err != nil {
-		c.logger.Warnf("could not get oauth token to authenticate to team service API, only returning %d members for team %q: %v", len(members), teamID, err)
-		return members, nil
+		return nil, fmt.Errorf("could not get oauth token to authenticate to team service API: %v", err)
 	}
 
 	teamInfo, err := c.teamsAPIClient.TeamInfo(teamID, token)
 	if err != nil {
-		c.logger.Warnf("could not get team info for team %q, only returning %d members: %v", teamID, len(members), err)
-		return members, nil
+		return nil, fmt.Errorf("could not get team info for team %q: %v", teamID, err)
 	}
 
 	for _, member := range teamInfo.Members {
diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go
index d0d503b61..3da933644 100644
--- a/pkg/util/users/users.go
+++ b/pkg/util/users/users.go
@@ -40,6 +40,7 @@ func (strategy DefaultUserSyncStrategy) ProduceSyncRequests(dbUsers spec.PgUserM
 
 	var reqs []spec.PgSyncUserRequest
 	for name, newUser := range newUsers {
+		// do not create user that exists in DB with deletion suffix
 		if newUser.Deleted {
 			continue
 		}
@@ -156,6 +157,7 @@ func (strategy DefaultUserSyncStrategy) alterPgUserSet(user spec.PgUser, db *sql
 func (strategy DefaultUserSyncStrategy) alterPgUserRename(user spec.PgUser, db *sql.DB) error {
 	var query string
 
+	// append or trim deletion suffix depending if the user has the suffix or not
 	if user.Deleted {
 		newName := strings.TrimSuffix(user.Name, strategy.RoleDeletionSuffix)
 		query = fmt.Sprintf(alterUserRenameSQL, user.Name, newName, "")