diff --git a/web/service/tgbot.go b/web/service/tgbot.go
index e7975460..21baba38 100644
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -319,12 +319,9 @@ func (t *Tgbot) OnReceive() {
 				message_text, _ := t.BuildClientDataMessage()
 
 				inlineKeyboard := tu.InlineKeyboard(
-					tu.InlineKeyboardRow(
-						tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitEnable")).WithCallbackData("add_client_submit_enable"),
-						tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitDisable")).WithCallbackData("add_client_submit_disable"),
-					),
 					tu.InlineKeyboardRow(
 						tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.cancel")).WithCallbackData("add_client_cancel"),
+						tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitDisable")).WithCallbackData("add_client_submit_disable"),
 					),
 				)
 				t.SendMsgToTgbot(message.Chat.ID, message_text, inlineKeyboard)
@@ -1106,10 +1103,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 
 		inlineKeyboard := tu.InlineKeyboard(
 			tu.InlineKeyboardRow(
-				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitEnable")).WithCallbackData("add_client_submit_enable"),
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitDisable")).WithCallbackData("add_client_submit_disable"),
-			),
-			tu.InlineKeyboardRow(
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.cancel")).WithCallbackData("add_client_cancel"),
 			),
 		)
@@ -1119,14 +1113,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 	case "add_client_cancel":
 		delete(userStates, chatId)
 		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.messages.cancel"), tu.ReplyKeyboardRemove())
-	case "add_client_submit_enable":
-		_, err := t.SubmitAddClient()
-		if err != nil {
-			errorMessage := fmt.Sprintf("%v", err)
-			t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.messages.error_add_client", "error=="+errorMessage), tu.ReplyKeyboardRemove())
-		} else {
-			t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.messages.success_add_client"), tu.ReplyKeyboardRemove())
-		}
 	case "add_client_submit_disable":
 		client_Enable = false
 		_, err := t.SubmitAddClient()
@@ -1962,10 +1948,7 @@ func (t *Tgbot) addClient(chatId int64, msg string, messageID ...int) {
 			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_default")).WithCallbackData("add_client_ch_default"),
 		),
 		tu.InlineKeyboardRow(
-			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitEnable")).WithCallbackData("add_client_submit_enable"),
 			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.submitDisable")).WithCallbackData("add_client_submit_disable"),
-		),
-		tu.InlineKeyboardRow(
 			tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.cancel")).WithCallbackData("add_client_cancel"),
 		),
 	)
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index bea6ea1b..07b22055 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -623,8 +623,7 @@
 "allClients" = "All Clients"
 
 "addClient" = "Add Client"
-"submitEnable" = "Submit As Enable ✅"
-"submitDisable" = "Submit As Disable 🚫"
+"submitDisable" = "Submit As Disable ✅"
 "use_default" = "🏷️ Use default"
 "change_default" = "🔄⚙️ Change Default"
 
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index a17f07e2..56ebf293 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -624,8 +624,7 @@
 "allClients" = "Todos los Clientes"
 
 "addClient" = "Añadir Cliente"
-"submitEnable" = "Enviar como Habilitado ✅"
-"submitDisable" = "Enviar como Deshabilitado 🚫"
+"submitDisable" = "Enviar como Deshabilitado ✅"
 "use_default" = "🏷️ Usar por defecto"
 "change_default" = "🔄⚙️ Cambiar por defecto"
 
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index e5649811..58e84b95 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -624,8 +624,7 @@
 "allClients" = "همه مشتریان"
 
 "addClient" = "افزودن مشتری"
-"submitEnable" = "ارسال به عنوان فعال ✅"
-"submitDisable" = "ارسال به عنوان غیرفعال 🚫"
+"submitDisable" = "ارسال به عنوان غیرفعال ✅"
 "use_default" = "🏷️ استفاده از پیش‌فرض"
 "change_default" = "🔄⚙️ تغییر پیش‌فرض"
 
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index bcf733be..703b799b 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -624,8 +624,7 @@
 "allClients" = "Semua Klien"
 
 "addClient" = "Tambah Klien"
-"submitEnable" = "Kirim Sebagai Aktif ✅"
-"submitDisable" = "Kirim Sebagai Nonaktif 🚫"
+"submitDisable" = "Kirim Sebagai Nonaktif ✅"
 "use_default" = "🏷️ Gunakan Default"
 "change_default" = "🔄⚙️ Ubah Default"
 
diff --git a/web/translation/translate.ja_JP.toml b/web/translation/translate.ja_JP.toml
index 756402fc..5e1b92d5 100644
--- a/web/translation/translate.ja_JP.toml
+++ b/web/translation/translate.ja_JP.toml
@@ -624,8 +624,7 @@
 "allClients" = "すべてのクライアント"
 
 "addClient" = "クライアントを追加"
-"submitEnable" = "有効として送信 ✅"
-"submitDisable" = "無効として送信 🚫"
+"submitDisable" = "無効として送信 ✅"
 "use_default" = "🏷️ デフォルトを使用"
 "change_default" = "🔄⚙️ デフォルトを変更"
 
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index 3f237b28..31a14376 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -624,8 +624,7 @@
 "allClients" = "Todos os clientes"
 
 "addClient" = "Adicionar Cliente"
-"submitEnable" = "Enviar como Ativado ✅"
-"submitDisable" = "Enviar como Desativado 🚫"
+"submitDisable" = "Enviar como Desativado ✅"
 "use_default" = "🏷️ Usar padrão"
 "change_default" = "🔄⚙️ Alterar Padrão"
 
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 8b4a94d3..9f753d49 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -624,8 +624,7 @@
 "allClients" = "Все клиенты"
 
 "addClient" = "Добавить клиента"
-"submitEnable" = "Отправить как включено ✅"
-"submitDisable" = "Отправить как отключено 🚫"
+"submitDisable" = "Отправить как отключено ✅"
 "use_default" = "🏷️ Использовать по умолчанию"
 "change_default" = "🔄⚙️ Изменить по умолчанию"
 
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index 90481b3b..f4dec336 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -624,8 +624,7 @@
 "allClients" = "Tüm Müşteriler"
 
 "addClient" = "Müşteri Ekle"
-"submitEnable" = "Etkin Olarak Gönder ✅"
-"submitDisable" = "Devre Dışı Olarak Gönder 🚫"
+"submitDisable" = "Devre Dışı Olarak Gönder ✅"
 "use_default" = "🏷️ Varsayılanı Kullan"
 "change_default" = "🔄⚙️ Varsayılanı Değiştir"
 
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index adc522ac..00b622c5 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -624,8 +624,7 @@
 "allClients" = "Всі Клієнти"
 
 "addClient" = "Додати клієнта"
-"submitEnable" = "Надіслати як увімкнено ✅"
-"submitDisable" = "Надіслати як вимкнено 🚫"
+"submitDisable" = "Надіслати як вимкнено ✅"
 "use_default" = "🏷️ Використати за замовчуванням"
 "change_default" = "🔄⚙️ Змінити за замовчуванням"
 
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 1ebe0baf..95fa2b7c 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -624,8 +624,7 @@
 "allClients" = "Tất cả Khách hàng"
 
 "addClient" = "Thêm Khách Hàng"
-"submitEnable" = "Gửi Dưới Dạng Bật ✅"
-"submitDisable" = "Gửi Dưới Dạng Tắt 🚫"
+"submitDisable" = "Gửi Dưới Dạng Tắt ✅"
 "use_default" = "🏷️ Sử dụng mặc định"
 "change_default" = "🔄⚙️ Thay đổi mặc định"
 
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index 4ab663af..b6946e97 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -624,8 +624,7 @@
 "allClients" = "所有客户"
 
 "addClient" = "添加客户"
-"submitEnable" = "提交为启用 ✅"
-"submitDisable" = "提交为禁用 🚫"
+"submitDisable" = "提交为禁用 ✅"
 "use_default" = "🏷️ 使用默认"
 "change_default" = "🔄⚙️ 更改默认"
 
diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml
index 88836c3f..bf9c6b55 100644
--- a/web/translation/translate.zh_TW.toml
+++ b/web/translation/translate.zh_TW.toml
@@ -624,8 +624,7 @@
 "allClients" = "所有客戶"
 
 "addClient" = "新增客戶"
-"submitEnable" = "提交為啟用 ✅"
-"submitDisable" = "提交為停用 🚫"
+"submitDisable" = "提交為停用 ✅"
 "use_default" = "🏷️ 使用預設"
 "change_default" = "🔄⚙️ 更改預設"