feat(console): message and login texts, privacy policy (#2016)

* message texts wrapper components

* message-text sub, i18n, grid

* fix routing

* pack

* pack

* update material

* audit

* fix mgmt service for labelplcy

* map conv

* edit text from map

* request map

* fetch data, mgmt admin service

* warn box, i18n

* resetbtn

* login texts

* login text requests

* reset, default, i18n

* disabled, features, message text setter, service

* locale switcher

* policy grid

* password reset, domain claimed i18n

* lint files

* fix admin service, i18n, lang setter

* fix scss duplicate

* privacy policy, cleanup grid, fix message, login texts (#2031)

* policy grid everywhere 🦒

* cleanup home

* log login text request

* patch all data

* refresh toggle

* fix: add dialog for unsaved changes (#2057)

* logintexts dialog

* check for dialog on pairwise operation

* fix: patch value to local state after save

* fix: i18n and custom login texts (#2060)

* fix: i18n and custom login texts

* fix: tos and privacy texts

* fix frontend

* fix: tos and privacy texts and tests

* fix: i18n, tos and privacy texts and tests

* fix frontend maps

* i18n

* add ResetCustomLoginTextToDefault in admin api and fix template remove in handlers

* resetlogintexttodefault

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

internal/command/custom_login_text.go

@@ -731,19 +731,11 @@ func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *events
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserTOSLink, existingText.RegistrationUserTOSLink, text.RegistrationUser.TOSLink, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
 	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserTOSLinkText, existingText.RegistrationUserTOSLinkText, text.RegistrationUser.TOSLinkText, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserPrivacyConfirm, existingText.RegistrationUserPrivacyConfirm, text.RegistrationUser.PrivacyConfirm, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserPrivacyLink, existingText.RegistrationUserPrivacyLink, text.RegistrationUser.PrivacyLink, text.Language, defaultText)
+	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserTOSConfirmAnd, existingText.RegistrationUserTOSConfirmAnd, text.RegistrationUser.TOSConfirmAnd, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
 	}
@@ -751,10 +743,6 @@ func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *events
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserExternalLoginDescription, existingText.RegistrationUserExternalLoginDescription, text.RegistrationUser.ExternalLoginDescription, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
 	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserNextButtonText, existingText.RegistrationUserNextButtonText, text.RegistrationUser.NextButtonText, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
@@ -812,19 +800,11 @@ func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventst
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgTOSLink, existingText.RegisterOrgTOSLink, text.RegistrationOrg.TOSLink, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
 	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgTOSLinkText, existingText.RegisterOrgTOSLinkText, text.RegistrationOrg.TOSLinkText, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgPrivacyConfirm, existingText.RegisterOrgPrivacyConfirm, text.RegistrationOrg.PrivacyConfirm, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgPrivacyLink, existingText.RegisterOrgPrivacyLink, text.RegistrationOrg.PrivacyLink, text.Language, defaultText)
+	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgTosConfirmAnd, existingText.RegisterOrgTOSConfirmAnd, text.RegistrationOrg.TOSConfirmAnd, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
 	}
@@ -832,10 +812,6 @@ func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventst
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgExternalLoginDescription, existingText.RegisterOrgExternalLoginDescription, text.RegistrationOrg.ExternalLoginDescription, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
 	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgSaveButtonText, existingText.RegisterOrgSaveButtonText, text.RegistrationOrg.SaveButtonText, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
@@ -929,15 +905,7 @@ func (c *Commands) createFooterTextEvents(ctx context.Context, agg *eventstore.A
 	if event != nil {
 		events = append(events, event)
 	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyFooterTOSLink, existingText.FooterTOSLink, text.Footer.TOSLink, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyFooterPrivacy, existingText.FooterPrivacyPolicy, text.Footer.PrivacyPolicy, text.Language, defaultText)
-	if event != nil {
-		events = append(events, event)
-	}
-	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyFooterPrivacyLink, existingText.FooterPrivacyPolicyLink, text.Footer.PrivacyPolicyLink, text.Language, defaultText)
+	event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyFooterPrivacyPolicy, existingText.FooterPrivacyPolicy, text.Footer.PrivacyPolicy, text.Language, defaultText)
 	if event != nil {
 		events = append(events, event)
 	}

internal/command/custom_login_text_model.go

@@ -168,46 +168,42 @@ type CustomLoginTextReadModel struct {
 	RegistrationOptionUserNameButtonText       string
 	RegistrationOptionExternalLoginDescription string
 
-	RegistrationUserTitle                    string
-	RegistrationUserDescription              string
-	RegistrationUserDescriptionOrgRegister   string
-	RegistrationUserFirstnameLabel           string
-	RegistrationUserLastnameLabel            string
-	RegistrationUserEmailLabel               string
-	RegistrationUserUsernameLabel            string
-	RegistrationUserLanguageLabel            string
-	RegistrationUserGenderLabel              string
-	RegistrationUserPasswordLabel            string
-	RegistrationUserPasswordConfirmLabel     string
-	RegistrationUserTOSAndPrivacyLabel       string
-	RegistrationUserTOSConfirm               string
-	RegistrationUserTOSLink                  string
-	RegistrationUserTOSLinkText              string
-	RegistrationUserPrivacyConfirm           string
-	RegistrationUserPrivacyLink              string
-	RegistrationUserPrivacyLinkText          string
-	RegistrationUserExternalLoginDescription string
-	RegistrationUserNextButtonText           string
-	RegistrationUserBackButtonText           string
+	RegistrationUserTitle                  string
+	RegistrationUserDescription            string
+	RegistrationUserDescriptionOrgRegister string
+	RegistrationUserFirstnameLabel         string
+	RegistrationUserLastnameLabel          string
+	RegistrationUserEmailLabel             string
+	RegistrationUserUsernameLabel          string
+	RegistrationUserLanguageLabel          string
+	RegistrationUserGenderLabel            string
+	RegistrationUserPasswordLabel          string
+	RegistrationUserPasswordConfirmLabel   string
+	RegistrationUserTOSAndPrivacyLabel     string
+	RegistrationUserTOSConfirm             string
+	RegistrationUserTOSLink                string
+	RegistrationUserTOSLinkText            string
+	RegistrationUserTOSConfirmAnd          string
+	RegistrationUserPrivacyLink            string
+	RegistrationUserPrivacyLinkText        string
+	RegistrationUserNextButtonText         string
+	RegistrationUserBackButtonText         string
 
-	RegisterOrgTitle                    string
-	RegisterOrgDescription              string
-	RegisterOrgOrgNameLabel             string
-	RegisterOrgFirstnameLabel           string
-	RegisterOrgLastnameLabel            string
-	RegisterOrgUsernameLabel            string
-	RegisterOrgEmailLabel               string
-	RegisterOrgPasswordLabel            string
-	RegisterOrgPasswordConfirmLabel     string
-	RegisterOrgTOSAndPrivacyLabel       string
-	RegisterOrgTOSConfirm               string
-	RegisterOrgTOSLink                  string
-	RegisterOrgTOSLinkText              string
-	RegisterOrgPrivacyConfirm           string
-	RegisterOrgPrivacyLink              string
-	RegisterOrgPrivacyLinkText          string
-	RegisterOrgExternalLoginDescription string
-	RegisterOrgSaveButtonText           string
+	RegisterOrgTitle                string
+	RegisterOrgDescription          string
+	RegisterOrgOrgNameLabel         string
+	RegisterOrgFirstnameLabel       string
+	RegisterOrgLastnameLabel        string
+	RegisterOrgUsernameLabel        string
+	RegisterOrgEmailLabel           string
+	RegisterOrgPasswordLabel        string
+	RegisterOrgPasswordConfirmLabel string
+	RegisterOrgTOSAndPrivacyLabel   string
+	RegisterOrgTOSConfirm           string
+	RegisterOrgTOSLinkText          string
+	RegisterOrgTOSConfirmAnd        string
+	RegisterOrgPrivacyLinkText      string
+	RegisterOrgSaveButtonText       string
 
 	LinkingUserDoneTitle            string
 	LinkingUserDoneDescription      string
@@ -228,12 +224,10 @@ type CustomLoginTextReadModel struct {
 	LogoutDoneDescription     string
 	LogoutDoneLoginButtonText string
 
-	FooterTOS               string
-	FooterTOSLink           string
-	FooterPrivacyPolicy     string
-	FooterPrivacyPolicyLink string
-	FooterHelp              string
-	FooterHelpLink          string
+	FooterTOS           string
+	FooterPrivacyPolicy string
+	FooterHelp          string
+	FooterHelpLink      string
 }
 
 func (wm *CustomLoginTextReadModel) Reduce() error {
@@ -1708,30 +1702,18 @@ func (wm *CustomLoginTextReadModel) handleRegistrationUserScreenSetEvent(e *poli
 		wm.RegistrationUserTOSConfirm = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserTOSLink {
-		wm.RegistrationUserTOSLink = e.Text
-		return
-	}
 	if e.Key == domain.LoginKeyRegistrationUserTOSLinkText {
 		wm.RegistrationUserTOSLinkText = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserPrivacyConfirm {
-		wm.RegistrationUserPrivacyConfirm = e.Text
-		return
-	}
-	if e.Key == domain.LoginKeyRegistrationUserPrivacyLink {
-		wm.RegistrationUserPrivacyLink = e.Text
+	if e.Key == domain.LoginKeyRegistrationUserTOSConfirmAnd {
+		wm.RegistrationUserTOSConfirmAnd = e.Text
 		return
 	}
 	if e.Key == domain.LoginKeyRegistrationUserPrivacyLinkText {
 		wm.RegistrationUserPrivacyLinkText = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserExternalLoginDescription {
-		wm.RegistrationUserExternalLoginDescription = e.Text
-		return
-	}
 	if e.Key == domain.LoginKeyRegistrationUserNextButtonText {
 		wm.RegistrationUserNextButtonText = e.Text
 		return
@@ -1795,30 +1777,18 @@ func (wm *CustomLoginTextReadModel) handleRegistrationUserScreenRemoveEvent(e *p
 		wm.RegistrationUserTOSConfirm = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserTOSLink {
-		wm.RegistrationUserTOSLink = ""
-		return
-	}
 	if e.Key == domain.LoginKeyRegistrationUserTOSLinkText {
 		wm.RegistrationUserTOSLinkText = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserPrivacyConfirm {
-		wm.RegistrationUserPrivacyConfirm = ""
-		return
-	}
-	if e.Key == domain.LoginKeyRegistrationUserPrivacyLink {
-		wm.RegistrationUserPrivacyLink = ""
+	if e.Key == domain.LoginKeyRegistrationUserTOSConfirmAnd {
+		wm.RegistrationUserTOSConfirmAnd = ""
 		return
 	}
 	if e.Key == domain.LoginKeyRegistrationUserPrivacyLinkText {
 		wm.RegistrationUserPrivacyLinkText = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegistrationUserExternalLoginDescription {
-		wm.RegistrationUserExternalLoginDescription = ""
-		return
-	}
 	if e.Key == domain.LoginKeyRegistrationUserNextButtonText {
 		wm.RegistrationUserNextButtonText = ""
 		return
@@ -1874,30 +1844,18 @@ func (wm *CustomLoginTextReadModel) handleRegistrationOrgScreenSetEvent(e *polic
 		wm.RegisterOrgTOSConfirm = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgTOSLink {
-		wm.RegisterOrgTOSLink = e.Text
-		return
-	}
 	if e.Key == domain.LoginKeyRegisterOrgTOSLinkText {
 		wm.RegisterOrgTOSLinkText = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgPrivacyConfirm {
-		wm.RegisterOrgPrivacyConfirm = e.Text
-		return
-	}
-	if e.Key == domain.LoginKeyRegisterOrgPrivacyLink {
-		wm.RegisterOrgPrivacyLink = e.Text
+	if e.Key == domain.LoginKeyRegisterOrgTosConfirmAnd {
+		wm.RegisterOrgTOSConfirmAnd = e.Text
 		return
 	}
 	if e.Key == domain.LoginKeyRegisterOrgPrivacyLinkText {
 		wm.RegisterOrgPrivacyLinkText = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgExternalLoginDescription {
-		wm.RegisterOrgExternalLoginDescription = e.Text
-		return
-	}
 	if e.Key == domain.LoginKeyRegisterOrgSaveButtonText {
 		wm.RegisterOrgSaveButtonText = e.Text
 		return
@@ -1949,30 +1907,18 @@ func (wm *CustomLoginTextReadModel) handleRegistrationOrgScreenRemoveEvent(e *po
 		wm.RegisterOrgTOSConfirm = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgTOSLink {
-		wm.RegisterOrgTOSLink = ""
-		return
-	}
 	if e.Key == domain.LoginKeyRegisterOrgTOSLinkText {
 		wm.RegisterOrgTOSLinkText = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgPrivacyConfirm {
-		wm.RegisterOrgPrivacyConfirm = ""
-		return
-	}
-	if e.Key == domain.LoginKeyRegisterOrgPrivacyLink {
-		wm.RegisterOrgPrivacyLink = ""
+	if e.Key == domain.LoginKeyRegisterOrgTosConfirmAnd {
+		wm.RegisterOrgTOSConfirmAnd = ""
 		return
 	}
 	if e.Key == domain.LoginKeyRegisterOrgPrivacyLinkText {
 		wm.RegisterOrgPrivacyLinkText = ""
 		return
 	}
-	if e.Key == domain.LoginKeyRegisterOrgExternalLoginDescription {
-		wm.RegisterOrgExternalLoginDescription = ""
-		return
-	}
 	if e.Key == domain.LoginKeyRegisterOrgSaveButtonText {
 		wm.RegisterOrgSaveButtonText = ""
 		return
@@ -2128,18 +2074,10 @@ func (wm *CustomLoginTextReadModel) handleFooterTextSetEvent(e *policy.CustomTex
 		wm.FooterTOS = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyFooterTOSLink {
-		wm.FooterTOSLink = e.Text
-		return
-	}
-	if e.Key == domain.LoginKeyFooterPrivacy {
+	if e.Key == domain.LoginKeyFooterPrivacyPolicy {
 		wm.FooterPrivacyPolicy = e.Text
 		return
 	}
-	if e.Key == domain.LoginKeyFooterPrivacyLink {
-		wm.FooterPrivacyPolicyLink = e.Text
-		return
-	}
 	if e.Key == domain.LoginKeyFooterHelp {
 		wm.FooterHelp = e.Text
 		return
@@ -2155,18 +2093,10 @@ func (wm *CustomLoginTextReadModel) handleFooterTextRemoveEvent(e *policy.Custom
 		wm.FooterTOS = ""
 		return
 	}
-	if e.Key == domain.LoginKeyFooterTOSLink {
-		wm.FooterTOSLink = ""
-		return
-	}
-	if e.Key == domain.LoginKeyFooterPrivacy {
+	if e.Key == domain.LoginKeyFooterPrivacyPolicy {
 		wm.FooterPrivacyPolicy = ""
 		return
 	}
-	if e.Key == domain.LoginKeyFooterPrivacyLink {
-		wm.FooterPrivacyPolicyLink = ""
-		return
-	}
 	if e.Key == domain.LoginKeyFooterHelp {
 		wm.FooterHelp = ""
 		return

internal/command/iam_custom_login_text.go

@@ -28,6 +28,26 @@ func (c *Commands) SetCustomIAMLoginText(ctx context.Context, loginText *domain.
 	return writeModelToObjectDetails(&existingMailText.WriteModel), nil
 }
 
+func (c *Commands) RemoveCustomIAMLoginTexts(ctx context.Context, lang language.Tag) (*domain.ObjectDetails, error) {
+	if lang == language.Und {
+		return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-Gfbg3", "Errors.CustomText.Invalid")
+	}
+	customText, err := c.defaultLoginTextWriteModelByID(ctx, lang)
+	if err != nil {
+		return nil, err
+	}
+	if customText.State == domain.PolicyStateUnspecified || customText.State == domain.PolicyStateRemoved {
+		return nil, caos_errs.ThrowNotFound(nil, "IAM-fru44", "Errors.CustomText.NotFound")
+	}
+	iamAgg := IAMAggregateFromWriteModel(&customText.WriteModel)
+	pushedEvents, err := c.eventstore.PushEvents(ctx, iam.NewCustomTextTemplateRemovedEvent(ctx, iamAgg, domain.LoginCustomText, lang))
+	err = AppendAndReduce(customText, pushedEvents...)
+	if err != nil {
+		return nil, err
+	}
+	return writeModelToObjectDetails(&customText.WriteModel), nil
+}
+
 func (c *Commands) setCustomIAMLoginText(ctx context.Context, iamAgg *eventstore.Aggregate, text *domain.CustomLoginText) ([]eventstore.EventPusher, *IAMCustomLoginTextReadModel, error) {
 	if !text.IsValid() {
 		return nil, nil, caos_errs.ThrowInvalidArgument(nil, "IAM-kd9fs", "Errors.CustomText.Invalid")

internal/command/iam_custom_login_text_model.go

@@ -31,6 +31,8 @@ func (wm *IAMCustomLoginTextReadModel) AppendEvents(events ...eventstore.EventRe
 			wm.CustomLoginTextReadModel.AppendEvents(&e.CustomTextSetEvent)
 		case *iam.CustomTextRemovedEvent:
 			wm.CustomLoginTextReadModel.AppendEvents(&e.CustomTextRemovedEvent)
+		case *iam.CustomTextTemplateRemovedEvent:
+			wm.CustomLoginTextReadModel.AppendEvents(&e.CustomTextTemplateRemovedEvent)
 		}
 	}
 }
@@ -47,6 +49,7 @@ func (wm *IAMCustomLoginTextReadModel) Query() *eventstore.SearchQueryBuilder {
 		AggregateTypes(iam.AggregateType).
 		EventTypes(
 			iam.CustomTextSetEventType,
-			iam.CustomTextRemovedEventType).
+			iam.CustomTextRemovedEventType,
+			iam.CustomTextTemplateRemovedEventType).
 		Builder()
 }

internal/command/iam_custom_login_text_test.go

@@ -764,11 +764,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -776,12 +771,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -789,11 +779,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -859,11 +844,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -871,12 +851,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -884,11 +859,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -976,17 +946,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -1183,47 +1143,41 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						ExternalLoginDescription:           "ExternalLoginDescription",
 					},
 					RegistrationUser: domain.RegistrationUserScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						DescriptionOrgRegister:   "DescriptionOrgRegister",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						EmailLabel:               "EmailLabel",
-						UsernameLabel:            "UsernameLabel",
-						LanguageLabel:            "LanguageLabel",
-						GenderLabel:              "GenderLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						NextButtonText:           "NextButtonText",
-						BackButtonText:           "BackButtonText",
+						Title:                  "Title",
+						Description:            "Description",
+						DescriptionOrgRegister: "DescriptionOrgRegister",
+						FirstnameLabel:         "FirstnameLabel",
+						LastnameLabel:          "LastnameLabel",
+						EmailLabel:             "EmailLabel",
+						UsernameLabel:          "UsernameLabel",
+						LanguageLabel:          "LanguageLabel",
+						GenderLabel:            "GenderLabel",
+						PasswordLabel:          "PasswordLabel",
+						PasswordConfirmLabel:   "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:     "TOSAndPrivacyLabel",
+						TOSConfirm:             "TOSConfirm",
+						TOSLinkText:            "TOSLinkText",
+						TOSConfirmAnd:          "TOSConfirmAnd",
+						PrivacyLinkText:        "PrivacyLinkText",
+						NextButtonText:         "NextButtonText",
+						BackButtonText:         "BackButtonText",
 					},
 					RegistrationOrg: domain.RegistrationOrgScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						OrgNameLabel:             "OrgNameLabel",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						UsernameLabel:            "UsernameLabel",
-						EmailLabel:               "EmailLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						SaveButtonText:           "SaveButtonText",
+						Title:                "Title",
+						Description:          "Description",
+						OrgNameLabel:         "OrgNameLabel",
+						FirstnameLabel:       "FirstnameLabel",
+						LastnameLabel:        "LastnameLabel",
+						UsernameLabel:        "UsernameLabel",
+						EmailLabel:           "EmailLabel",
+						PasswordLabel:        "PasswordLabel",
+						PasswordConfirmLabel: "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:   "TOSAndPrivacyLabel",
+						TOSConfirm:           "TOSConfirm",
+						TOSLinkText:          "TOSLinkText",
+						TOSConfirmAnd:        "TOSConfirmAnd",
+						PrivacyLinkText:      "PrivacyLinkText",
+						SaveButtonText:       "SaveButtonText",
 					},
 					LinkingUsersDone: domain.LinkingUserDoneScreenText{
 						Title:            "Title",
@@ -1249,12 +1203,10 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						LoginButtonText: "LoginButtonText",
 					},
 					Footer: domain.FooterText{
-						TOS:               "TOS",
-						TOSLink:           "TOSLink",
-						PrivacyPolicy:     "PrivacyPolicy",
-						PrivacyPolicyLink: "PrivacyPolicyLink",
-						Help:              "Help",
-						HelpLink:          "HelpLink",
+						TOS:           "TOS",
+						PrivacyPolicy: "PrivacyPolicy",
+						Help:          "Help",
+						HelpLink:      "HelpLink",
 					},
 				},
 			},
@@ -1980,11 +1932,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -1992,12 +1939,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2005,11 +1947,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -2075,11 +2012,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -2087,12 +2019,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2100,11 +2027,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -2192,17 +2114,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2928,11 +2840,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, language.English,
@@ -2940,12 +2847,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -2953,11 +2855,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, language.English,
@@ -3023,11 +2920,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, language.English,
@@ -3035,12 +2927,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -3048,11 +2935,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, language.English,
@@ -3140,17 +3022,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextRemovedEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -3925,11 +3797,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -3937,12 +3804,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -3950,11 +3812,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -4020,11 +3877,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -4032,12 +3884,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4045,11 +3892,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -4137,17 +3979,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextSetEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4870,11 +4702,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, language.English,
@@ -4882,12 +4709,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4895,11 +4717,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, language.English,
@@ -4965,11 +4782,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, language.English,
@@ -4977,12 +4789,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4990,11 +4797,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, language.English,
 							),
 						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, language.English,
-							),
-						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
 								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, language.English,
@@ -5082,17 +4884,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, language.English,
-							),
-						),
-						eventFromEventPusher(
-							iam.NewCustomTextRemovedEvent(context.Background(),
-								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, language.English,
+								&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -5818,11 +5610,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -5830,12 +5617,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -5843,11 +5625,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -5913,11 +5690,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -5925,12 +5697,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -5938,11 +5705,6 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
 									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -6030,17 +5792,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-								),
-							),
-							eventFromEventPusher(
-								iam.NewCustomTextSetEvent(context.Background(),
-									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+									&iam.NewAggregate().Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -6237,47 +5989,41 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						ExternalLoginDescription:           "ExternalLoginDescription",
 					},
 					RegistrationUser: domain.RegistrationUserScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						DescriptionOrgRegister:   "DescriptionOrgRegister",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						EmailLabel:               "EmailLabel",
-						UsernameLabel:            "UsernameLabel",
-						LanguageLabel:            "LanguageLabel",
-						GenderLabel:              "GenderLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						NextButtonText:           "NextButtonText",
-						BackButtonText:           "BackButtonText",
+						Title:                  "Title",
+						Description:            "Description",
+						DescriptionOrgRegister: "DescriptionOrgRegister",
+						FirstnameLabel:         "FirstnameLabel",
+						LastnameLabel:          "LastnameLabel",
+						EmailLabel:             "EmailLabel",
+						UsernameLabel:          "UsernameLabel",
+						LanguageLabel:          "LanguageLabel",
+						GenderLabel:            "GenderLabel",
+						PasswordLabel:          "PasswordLabel",
+						PasswordConfirmLabel:   "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:     "TOSAndPrivacyLabel",
+						TOSConfirm:             "TOSConfirm",
+						TOSLinkText:            "TOSLinkText",
+						TOSConfirmAnd:          "TOSConfirmAnd",
+						PrivacyLinkText:        "PrivacyLinkText",
+						NextButtonText:         "NextButtonText",
+						BackButtonText:         "BackButtonText",
 					},
 					RegistrationOrg: domain.RegistrationOrgScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						OrgNameLabel:             "OrgNameLabel",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						UsernameLabel:            "UsernameLabel",
-						EmailLabel:               "EmailLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						SaveButtonText:           "SaveButtonText",
+						Title:                "Title",
+						Description:          "Description",
+						OrgNameLabel:         "OrgNameLabel",
+						FirstnameLabel:       "FirstnameLabel",
+						LastnameLabel:        "LastnameLabel",
+						UsernameLabel:        "UsernameLabel",
+						EmailLabel:           "EmailLabel",
+						PasswordLabel:        "PasswordLabel",
+						PasswordConfirmLabel: "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:   "TOSAndPrivacyLabel",
+						TOSConfirm:           "TOSConfirm",
+						TOSLinkText:          "TOSLinkText",
+						TOSConfirmAnd:        "TOSConfirmAnd",
+						PrivacyLinkText:      "PrivacyLinkText",
+						SaveButtonText:       "SaveButtonText",
 					},
 					LinkingUsersDone: domain.LinkingUserDoneScreenText{
 						Title:            "Title",
@@ -6303,12 +6049,10 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
 						LoginButtonText: "LoginButtonText",
 					},
 					Footer: domain.FooterText{
-						TOS:               "TOS",
-						TOSLink:           "TOSLink",
-						PrivacyPolicy:     "PrivacyPolicy",
-						PrivacyPolicyLink: "PrivacyPolicyLink",
-						Help:              "Help",
-						HelpLink:          "HelpLink",
+						TOS:           "TOS",
+						PrivacyPolicy: "PrivacyPolicy",
+						Help:          "Help",
+						HelpLink:      "HelpLink",
 					},
 				},
 			},

internal/command/org_custom_login_text_test.go

@@ -781,11 +781,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -793,12 +788,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -806,11 +796,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -876,11 +861,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -888,12 +868,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -901,11 +876,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -993,17 +963,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -1201,47 +1161,41 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						ExternalLoginDescription:           "ExternalLoginDescription",
 					},
 					RegistrationUser: domain.RegistrationUserScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						DescriptionOrgRegister:   "DescriptionOrgRegister",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						EmailLabel:               "EmailLabel",
-						UsernameLabel:            "UsernameLabel",
-						LanguageLabel:            "LanguageLabel",
-						GenderLabel:              "GenderLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						NextButtonText:           "NextButtonText",
-						BackButtonText:           "BackButtonText",
+						Title:                  "Title",
+						Description:            "Description",
+						DescriptionOrgRegister: "DescriptionOrgRegister",
+						FirstnameLabel:         "FirstnameLabel",
+						LastnameLabel:          "LastnameLabel",
+						EmailLabel:             "EmailLabel",
+						UsernameLabel:          "UsernameLabel",
+						LanguageLabel:          "LanguageLabel",
+						GenderLabel:            "GenderLabel",
+						PasswordLabel:          "PasswordLabel",
+						PasswordConfirmLabel:   "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:     "TOSAndPrivacyLabel",
+						TOSConfirm:             "TOSConfirm",
+						TOSLinkText:            "TOSLinkText",
+						TOSConfirmAnd:          "TOSConfirmAnd",
+						PrivacyLinkText:        "PrivacyLinkText",
+						NextButtonText:         "NextButtonText",
+						BackButtonText:         "BackButtonText",
 					},
 					RegistrationOrg: domain.RegistrationOrgScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						OrgNameLabel:             "OrgNameLabel",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						UsernameLabel:            "UsernameLabel",
-						EmailLabel:               "EmailLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						SaveButtonText:           "SaveButtonText",
+						Title:                "Title",
+						Description:          "Description",
+						OrgNameLabel:         "OrgNameLabel",
+						FirstnameLabel:       "FirstnameLabel",
+						LastnameLabel:        "LastnameLabel",
+						UsernameLabel:        "UsernameLabel",
+						EmailLabel:           "EmailLabel",
+						PasswordLabel:        "PasswordLabel",
+						PasswordConfirmLabel: "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:   "TOSAndPrivacyLabel",
+						TOSConfirm:           "TOSConfirm",
+						TOSLinkText:          "TOSLinkText",
+						TOSConfirmAnd:        "TOSConfirmAnd",
+						PrivacyLinkText:      "PrivacyLinkText",
+						SaveButtonText:       "SaveButtonText",
 					},
 					LinkingUsersDone: domain.LinkingUserDoneScreenText{
 						Title:            "Title",
@@ -1267,12 +1221,10 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						LoginButtonText: "LoginButtonText",
 					},
 					Footer: domain.FooterText{
-						TOS:               "TOS",
-						TOSLink:           "TOSLink",
-						PrivacyPolicy:     "PrivacyPolicy",
-						PrivacyPolicyLink: "PrivacyPolicyLink",
-						Help:              "Help",
-						HelpLink:          "HelpLink",
+						TOS:           "TOS",
+						PrivacyPolicy: "PrivacyPolicy",
+						Help:          "Help",
+						HelpLink:      "HelpLink",
 					},
 				},
 			},
@@ -1998,11 +1950,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -2010,12 +1957,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2023,11 +1965,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -2093,11 +2030,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -2105,12 +2037,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2118,11 +2045,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -2210,17 +2132,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -2946,11 +2858,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, language.English,
@@ -2958,12 +2865,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -2971,11 +2873,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, language.English,
@@ -3041,11 +2938,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, language.English,
@@ -3053,12 +2945,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -3066,11 +2953,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, language.English,
@@ -3158,17 +3040,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextRemovedEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -3944,11 +3816,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -3956,12 +3823,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -3969,11 +3831,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -4039,11 +3896,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -4051,12 +3903,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4064,11 +3911,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -4156,17 +3998,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextSetEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4889,11 +4721,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, language.English,
@@ -4901,12 +4728,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -4914,11 +4736,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, language.English,
@@ -4984,11 +4801,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, language.English,
@@ -4996,12 +4808,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -5009,11 +4816,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, language.English,
 							),
 						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, language.English,
-							),
-						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
 								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, language.English,
@@ -5101,17 +4903,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						),
 						eventFromEventPusher(
 							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, language.English,
-							),
-						),
-						eventFromEventPusher(
-							org.NewCustomTextRemovedEvent(context.Background(),
-								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, language.English,
+								&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, language.English,
 							),
 						),
 						eventFromEventPusher(
@@ -5837,11 +5629,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSLinkText, "TOSLinkText", language.English,
@@ -5849,12 +5636,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLink, "PrivacyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -5862,11 +5644,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserNextButtonText, "NextButtonText", language.English,
@@ -5932,11 +5709,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSConfirm, "TOSConfirm", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLink, "TOSLink", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTOSLinkText, "TOSLinkText", language.English,
@@ -5944,12 +5716,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLink, "PrivacyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -5957,11 +5724,6 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyLinkText, "PrivacyLinkText", language.English,
 								),
 							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgExternalLoginDescription, "ExternalLoginDescription", language.English,
-								),
-							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
 									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgSaveButtonText, "SaveButtonText", language.English,
@@ -6049,17 +5811,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 							),
 							eventFromEventPusher(
 								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterTOSLink, "TOSLink", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacy, "PrivacyPolicy", language.English,
-								),
-							),
-							eventFromEventPusher(
-								org.NewCustomTextSetEvent(context.Background(),
-									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyLink, "PrivacyPolicyLink", language.English,
+									&org.NewAggregate("org1", "org1").Aggregate, domain.LoginCustomText, domain.LoginKeyFooterPrivacyPolicy, "PrivacyPolicy", language.English,
 								),
 							),
 							eventFromEventPusher(
@@ -6257,47 +6009,41 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						ExternalLoginDescription:           "ExternalLoginDescription",
 					},
 					RegistrationUser: domain.RegistrationUserScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						DescriptionOrgRegister:   "DescriptionOrgRegister",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						EmailLabel:               "EmailLabel",
-						UsernameLabel:            "UsernameLabel",
-						LanguageLabel:            "LanguageLabel",
-						GenderLabel:              "GenderLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						NextButtonText:           "NextButtonText",
-						BackButtonText:           "BackButtonText",
+						Title:                  "Title",
+						Description:            "Description",
+						DescriptionOrgRegister: "DescriptionOrgRegister",
+						FirstnameLabel:         "FirstnameLabel",
+						LastnameLabel:          "LastnameLabel",
+						EmailLabel:             "EmailLabel",
+						UsernameLabel:          "UsernameLabel",
+						LanguageLabel:          "LanguageLabel",
+						GenderLabel:            "GenderLabel",
+						PasswordLabel:          "PasswordLabel",
+						PasswordConfirmLabel:   "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:     "TOSAndPrivacyLabel",
+						TOSConfirm:             "TOSConfirm",
+						TOSLinkText:            "TOSLinkText",
+						TOSConfirmAnd:          "TOSConfirmAnd",
+						PrivacyLinkText:        "PrivacyLinkText",
+						NextButtonText:         "NextButtonText",
+						BackButtonText:         "BackButtonText",
 					},
 					RegistrationOrg: domain.RegistrationOrgScreenText{
-						Title:                    "Title",
-						Description:              "Description",
-						OrgNameLabel:             "OrgNameLabel",
-						FirstnameLabel:           "FirstnameLabel",
-						LastnameLabel:            "LastnameLabel",
-						UsernameLabel:            "UsernameLabel",
-						EmailLabel:               "EmailLabel",
-						PasswordLabel:            "PasswordLabel",
-						PasswordConfirmLabel:     "PasswordConfirmLabel",
-						TOSAndPrivacyLabel:       "TOSAndPrivacyLabel",
-						TOSConfirm:               "TOSConfirm",
-						TOSLink:                  "TOSLink",
-						TOSLinkText:              "TOSLinkText",
-						PrivacyConfirm:           "PrivacyConfirm",
-						PrivacyLink:              "PrivacyLink",
-						PrivacyLinkText:          "PrivacyLinkText",
-						ExternalLoginDescription: "ExternalLoginDescription",
-						SaveButtonText:           "SaveButtonText",
+						Title:                "Title",
+						Description:          "Description",
+						OrgNameLabel:         "OrgNameLabel",
+						FirstnameLabel:       "FirstnameLabel",
+						LastnameLabel:        "LastnameLabel",
+						UsernameLabel:        "UsernameLabel",
+						EmailLabel:           "EmailLabel",
+						PasswordLabel:        "PasswordLabel",
+						PasswordConfirmLabel: "PasswordConfirmLabel",
+						TOSAndPrivacyLabel:   "TOSAndPrivacyLabel",
+						TOSConfirm:           "TOSConfirm",
+						TOSLinkText:          "TOSLinkText",
+						TOSConfirmAnd:        "TOSConfirmAnd",
+						PrivacyLinkText:      "PrivacyLinkText",
+						SaveButtonText:       "SaveButtonText",
 					},
 					LinkingUsersDone: domain.LinkingUserDoneScreenText{
 						Title:            "Title",
@@ -6323,12 +6069,10 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
 						LoginButtonText: "LoginButtonText",
 					},
 					Footer: domain.FooterText{
-						TOS:               "TOS",
-						TOSLink:           "TOSLink",
-						PrivacyPolicy:     "PrivacyPolicy",
-						PrivacyPolicyLink: "PrivacyPolicyLink",
-						Help:              "Help",
-						HelpLink:          "HelpLink",
+						TOS:           "TOS",
+						PrivacyPolicy: "PrivacyPolicy",
+						Help:          "Help",
+						HelpLink:      "HelpLink",
 					},
 				},
 			},