diff --git a/internal/admin/repository/eventsourcing/handler/custom_text.go b/internal/admin/repository/eventsourcing/handler/custom_text.go
index 8a2d8697ab..58ac7e7b95 100644
--- a/internal/admin/repository/eventsourcing/handler/custom_text.go
+++ b/internal/admin/repository/eventsourcing/handler/custom_text.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
@@ -105,7 +106,7 @@ func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, text.Key, event)
 	default:
 		return m.view.ProcessedCustomTextSequence(event)
 	}
diff --git a/internal/admin/repository/eventsourcing/view/custom_texts.go b/internal/admin/repository/eventsourcing/view/custom_texts.go
index a2ee8212d6..5b17551732 100644
--- a/internal/admin/repository/eventsourcing/view/custom_texts.go
+++ b/internal/admin/repository/eventsourcing/view/custom_texts.go
@@ -28,8 +28,8 @@ func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event
 	return v.ProcessedCustomTextSequence(event)
 }
 
-func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
-	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+func (v *View) DeleteCustomText(aggregateID, textType, lang, key string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang, key)
 	if err != nil && !errors.IsNotFound(err) {
 		return err
 	}
diff --git a/internal/api/grpc/admin/custom_text.go b/internal/api/grpc/admin/custom_text.go
index aa61f4b3e1..b4de99fbda 100644
--- a/internal/api/grpc/admin/custom_text.go
+++ b/internal/api/grpc/admin/custom_text.go
@@ -97,7 +97,7 @@ func (s *Server) GetCustomVerifyEmailMessageText(ctx context.Context, req *admin
 	}, nil
 }
 
-func (s *Server) SetVerifyEmailMessageCustomText(ctx context.Context, req *admin_pb.SetDefaultVerifyEmailMessageTextRequest) (*admin_pb.SetDefaultVerifyEmailMessageTextResponse, error) {
+func (s *Server) SetDefaultVerifyEmailMessageText(ctx context.Context, req *admin_pb.SetDefaultVerifyEmailMessageTextRequest) (*admin_pb.SetDefaultVerifyEmailMessageTextResponse, error) {
 	result, err := s.command.SetDefaultMessageText(ctx, SetVerifyEmailCustomTextToDomain(req))
 	if err != nil {
 		return nil, err
diff --git a/internal/api/grpc/management/custom_text.go b/internal/api/grpc/management/custom_text.go
index 805292149f..85fd71ae7f 100644
--- a/internal/api/grpc/management/custom_text.go
+++ b/internal/api/grpc/management/custom_text.go
@@ -224,7 +224,7 @@ func (s *Server) GetDefaultDomainClaimedMessageText(ctx context.Context, req *mg
 	}, nil
 }
 
-func (s *Server) SetCustomDomainClaimedMessageText(ctx context.Context, req *mgmt_pb.SetCustomDomainClaimedMessageTextRequest) (*mgmt_pb.SetCustomDomainClaimedMessageTextResponse, error) {
+func (s *Server) SetCustomDomainClaimedMessageCustomText(ctx context.Context, req *mgmt_pb.SetCustomDomainClaimedMessageTextRequest) (*mgmt_pb.SetCustomDomainClaimedMessageTextResponse, error) {
 	result, err := s.command.SetOrgMessageText(ctx, authz.GetCtxData(ctx).OrgID, SetDomainClaimedCustomTextToDomain(req))
 	if err != nil {
 		return nil, err
diff --git a/internal/auth/repository/eventsourcing/handler/custom_text.go b/internal/auth/repository/eventsourcing/handler/custom_text.go
index 1cc457ddfc..ae2f5ec6bb 100644
--- a/internal/auth/repository/eventsourcing/handler/custom_text.go
+++ b/internal/auth/repository/eventsourcing/handler/custom_text.go
@@ -105,7 +105,7 @@ func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, text.Key, event)
 	default:
 		return m.view.ProcessedCustomTextSequence(event)
 	}
diff --git a/internal/auth/repository/eventsourcing/view/custom_texts.go b/internal/auth/repository/eventsourcing/view/custom_texts.go
index 7255b80e48..0e73943586 100644
--- a/internal/auth/repository/eventsourcing/view/custom_texts.go
+++ b/internal/auth/repository/eventsourcing/view/custom_texts.go
@@ -32,8 +32,8 @@ func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event
 	return v.ProcessedCustomTextSequence(event)
 }
 
-func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
-	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+func (v *View) DeleteCustomText(aggregateID, textType, lang, key string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang, key)
 	if err != nil && !errors.IsNotFound(err) {
 		return err
 	}
diff --git a/internal/iam/repository/view/custom_text_view.go b/internal/iam/repository/view/custom_text_view.go
index 901c3dab44..cdd76f6583 100644
--- a/internal/iam/repository/view/custom_text_view.go
+++ b/internal/iam/repository/view/custom_text_view.go
@@ -78,10 +78,11 @@ func PutCustomText(db *gorm.DB, table string, customText *model.CustomTextView)
 	return save(db, customText)
 }
 
-func DeleteCustomText(db *gorm.DB, table, aggregateID, template, lang string) error {
+func DeleteCustomText(db *gorm.DB, table, aggregateID, template, lang, key string) error {
 	aggregateIDSearch := repository.Key{Key: model.CustomTextSearchKey(iam_model.CustomTextSearchKeyAggregateID), Value: aggregateID}
 	templateSearch := repository.Key{Key: model.CustomTextSearchKey(iam_model.CustomTextSearchKeyTemplate), Value: template}
 	languageSearch := repository.Key{Key: model.CustomTextSearchKey(iam_model.CustomTextSearchKeyLanguage), Value: lang}
-	delete := repository.PrepareDeleteByKeys(table, aggregateIDSearch, templateSearch, languageSearch)
+	keySearch := repository.Key{Key: model.CustomTextSearchKey(iam_model.CustomTextSearchKeyKey), Value: key}
+	delete := repository.PrepareDeleteByKeys(table, aggregateIDSearch, templateSearch, keySearch, languageSearch)
 	return delete(db)
 }
diff --git a/internal/management/repository/eventsourcing/handler/custom_text.go b/internal/management/repository/eventsourcing/handler/custom_text.go
index 3e8f2c2eb9..68ff18f165 100644
--- a/internal/management/repository/eventsourcing/handler/custom_text.go
+++ b/internal/management/repository/eventsourcing/handler/custom_text.go
@@ -105,7 +105,7 @@ func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, text.Key, event)
 	default:
 		return m.view.ProcessedCustomTextSequence(event)
 	}
diff --git a/internal/management/repository/eventsourcing/view/custom_texts.go b/internal/management/repository/eventsourcing/view/custom_texts.go
index f5c6a9c443..40ac572b94 100644
--- a/internal/management/repository/eventsourcing/view/custom_texts.go
+++ b/internal/management/repository/eventsourcing/view/custom_texts.go
@@ -28,8 +28,8 @@ func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event
 	return v.ProcessedCustomTextSequence(event)
 }
 
-func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
-	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+func (v *View) DeleteCustomText(aggregateID, textType, lang, key string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang, key)
 	if err != nil && !errors.IsNotFound(err) {
 		return err
 	}
diff --git a/internal/notification/repository/eventsourcing/handler/custom_text.go b/internal/notification/repository/eventsourcing/handler/custom_text.go
index 90d05fe1ee..2a3bc667db 100644
--- a/internal/notification/repository/eventsourcing/handler/custom_text.go
+++ b/internal/notification/repository/eventsourcing/handler/custom_text.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
@@ -105,7 +106,7 @@ func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, text.Key, event)
 	default:
 		return m.view.ProcessedCustomTextSequence(event)
 	}
diff --git a/internal/notification/repository/eventsourcing/view/custom_texts.go b/internal/notification/repository/eventsourcing/view/custom_texts.go
index 967e69e539..b65fb5ded2 100644
--- a/internal/notification/repository/eventsourcing/view/custom_texts.go
+++ b/internal/notification/repository/eventsourcing/view/custom_texts.go
@@ -32,8 +32,8 @@ func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event
 	return v.ProcessedCustomTextSequence(event)
 }
 
-func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
-	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+func (v *View) DeleteCustomText(aggregateID, textType, lang, key string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang, key)
 	if err != nil && !errors.IsNotFound(err) {
 		return err
 	}
diff --git a/proto/zitadel/management.proto b/proto/zitadel/management.proto
index ef8afd749f..64ad710d4d 100644
--- a/proto/zitadel/management.proto
+++ b/proto/zitadel/management.proto
@@ -404,7 +404,7 @@ service ManagementService {
         };
     }
     // Removes the avatar number of the human
-    rpc RemoveMyAvatar(RemoveHumanAvatarRequest) returns (RemoveHumanAvatarResponse) {
+    rpc RemoveHumanAvatar(RemoveHumanAvatarRequest) returns (RemoveHumanAvatarResponse) {
         option (google.api.http) = {
             delete: "/users/{user_id}/avatar"
         };