diff --git a/api/bean/AppView.go b/api/bean/AppView.go
index b1c350690e..61fbe04f47 100644
--- a/api/bean/AppView.go
+++ b/api/bean/AppView.go
@@ -186,6 +186,7 @@ type DeploymentDetailContainer struct {
 	DeploymentConfig              *bean.DeploymentConfig `json:"-"`
 	IsPipelineTriggered           bool                   `json:"isPipelineTriggered"`
 	ReleaseMode                   string                 `json:"releaseMode"`
+	LastDeployedById              int                    `json:"-" sql:"last_deployed_by_id"`
 }
 
 type AppDetailContainer struct {
diff --git a/cmd/external-app/wire_gen.go b/cmd/external-app/wire_gen.go
index db064d11f4..b5dd660548 100644
--- a/cmd/external-app/wire_gen.go
+++ b/cmd/external-app/wire_gen.go
@@ -1,6 +1,6 @@
 // Code generated by Wire. DO NOT EDIT.
 
-//go:generate go run github.com/google/wire/cmd/wire
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
 //go:build !wireinject
 // +build !wireinject
 
diff --git a/internal/sql/repository/AppListingRepository.go b/internal/sql/repository/AppListingRepository.go
index 071948bca4..359d69f9a5 100644
--- a/internal/sql/repository/AppListingRepository.go
+++ b/internal/sql/repository/AppListingRepository.go
@@ -699,7 +699,7 @@ func (impl AppListingRepositoryImpl) FetchMinDetailOtherEnvironment(appId int) (
 func (impl AppListingRepositoryImpl) DeploymentDetailByArtifactId(ciArtifactId int, envId int) (bean.DeploymentDetailContainer, error) {
 	impl.Logger.Debug("reached at AppListingRepository:")
 	var deploymentDetail bean.DeploymentDetailContainer
-	query := "SELECT env.id AS environment_id, env.environment_name, env.default, pco.created_on as last_deployed_time, a.app_name" +
+	query := "SELECT env.id AS environment_id, env.environment_name, env.default, pco.created_on as last_deployed_time, pco.updated_by as last_deployed_by_id, a.app_name" +
 		" FROM pipeline_config_override pco" +
 		" INNER JOIN pipeline p on p.id = pco.pipeline_id" +
 		" INNER JOIN environment env ON env.id=p.environment_id" +
diff --git a/pkg/pipeline/CiHandler.go b/pkg/pipeline/CiHandler.go
index b247a2f991..7061494328 100644
--- a/pkg/pipeline/CiHandler.go
+++ b/pkg/pipeline/CiHandler.go
@@ -1517,7 +1517,9 @@ func (impl *CiHandlerImpl) FetchMaterialInfoByArtifactId(ciArtifactId int, envId
 			}
 		}
 
-		triggeredByUserEmailId, err = impl.userService.GetActiveEmailById(workflow.TriggeredBy)
+		//getting the user including both active and inactive both
+		// as there arises case of having the deleted user had triggered the deployment
+		triggeredByUserEmailId, err = impl.userService.GetEmailById(int32(deployDetail.LastDeployedById))
 		if err != nil && !util.IsErrNoRows(err) {
 			impl.Logger.Errorw("err", "err", err)
 			return &types.GitTriggerInfoResponse{}, err