diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go
index ea58184d3..73f077058 100644
--- a/pkg/cluster/pod.go
+++ b/pkg/cluster/pod.go
@@ -277,7 +277,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
 		return nil
 	}
 
-	if masterCandidatePod, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {
+	if _, err = c.movePodFromEndOfLifeNode(masterCandidatePod); err != nil {
 		return fmt.Errorf("could not move pod: %v", err)
 	}
 
diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
index 28bd05a5a..bb68eec1c 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -715,20 +715,26 @@ func (c *Cluster) updateSecret(
 	} else if secretUsername == c.systemUsers[constants.ReplicationUserKeyName].Name {
 		userKey = constants.ReplicationUserKeyName
 		userMap = c.systemUsers
-	} else if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
-		if secretUsername == c.systemUsers[constants.ConnectionPoolerUserKeyName].Name {
-			userKey = constants.ConnectionPoolerUserName
-			userMap = c.systemUsers
-		}
-	} else if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
-		if secretUsername == c.systemUsers[constants.EventStreamUserKeyName].Name {
-			userKey = fmt.Sprintf("%s%s", constants.EventStreamSourceSlotPrefix, constants.UserRoleNameSuffix)
-			userMap = c.systemUsers
-		}
 	} else {
 		userKey = secretUsername
 		userMap = c.pgUsers
 	}
+
+	// use system user when pooler is enabled and pooler user is specfied in manifest
+	if _, exists := c.systemUsers[constants.ConnectionPoolerUserKeyName]; exists {
+		if secretUsername == c.systemUsers[constants.ConnectionPoolerUserKeyName].Name {
+			userKey = constants.ConnectionPoolerUserName
+			userMap = c.systemUsers
+		}
+	}
+	// use system user when streams are defined and fes_user is specfied in manifest
+	if _, exists := c.systemUsers[constants.EventStreamUserKeyName]; exists {
+		if secretUsername == c.systemUsers[constants.EventStreamUserKeyName].Name {
+			userKey = fmt.Sprintf("%s%s", constants.EventStreamSourceSlotPrefix, constants.UserRoleNameSuffix)
+			userMap = c.systemUsers
+		}
+	}
+
 	pwdUser := userMap[userKey]
 	secretName := util.NameFromMeta(secret.ObjectMeta)