diff --git a/sdk/src/main/res/values-ar/strings.xml b/sdk/src/main/res/values-ar/strings.xml
index 3ed4d833..16694af4 100644
--- a/sdk/src/main/res/values-ar/strings.xml
+++ b/sdk/src/main/res/values-ar/strings.xml
@@ -51,6 +51,7 @@
     <string name="po_card_tokenization_card_details_number_placeholder">4242 4242 4242 4242</string>
     <string name="po_card_tokenization_billing_address_title">عنوان إرسال الفواتير</string>
     <string name="po_card_tokenization_billing_address_street">سطر العنوان %d</string>
+    <string name="po_card_tokenization_save_card">احفظ تفاصيل هذه البطاقة لاستخدامها في المستقبل</string>
     <string name="po_card_tokenization_error_card">إنَّ معلومات البطاقة غير صالحة</string>
     <string name="po_card_tokenization_error_card_expiration">إنّ تاريخ صلاحية البطاقة غير صالح</string>
     <string name="po_card_tokenization_error_card_number">إنّ رقم البطاقة غير صالح</string>
diff --git a/sdk/src/main/res/values-fr/strings.xml b/sdk/src/main/res/values-fr/strings.xml
index 805a3bbd..568a42a3 100644
--- a/sdk/src/main/res/values-fr/strings.xml
+++ b/sdk/src/main/res/values-fr/strings.xml
@@ -49,6 +49,7 @@
     <string name="po_card_tokenization_card_details_number_placeholder">4242 4242 4242 4242</string>
     <string name="po_card_tokenization_billing_address_title">Adresse de Facturation</string>
     <string name="po_card_tokenization_billing_address_street">Ligne d\'adresse %d</string>
+    <string name="po_card_tokenization_save_card">Enregistrer cette carte pour les paiements futurs</string>
     <string name="po_card_tokenization_error_card">Les informations de votre carte sont incorrectes.</string>
     <string name="po_card_tokenization_error_card_expiration">La date d\'expiration de votre carte est incorrecte.</string>
     <string name="po_card_tokenization_error_card_number">Votre numéro de carte est incorrect.</string>
diff --git a/sdk/src/main/res/values-pl/strings.xml b/sdk/src/main/res/values-pl/strings.xml
index 0bff27ea..ec2fea7f 100644
--- a/sdk/src/main/res/values-pl/strings.xml
+++ b/sdk/src/main/res/values-pl/strings.xml
@@ -50,6 +50,7 @@
     <string name="po_card_tokenization_card_details_number_placeholder">4242 4242 4242 4242</string>
     <string name="po_card_tokenization_billing_address_title">Adres do Faktury</string>
     <string name="po_card_tokenization_billing_address_street">Linia adresu %d</string>
+    <string name="po_card_tokenization_save_card">Zapisz tę kartę na przyszłe płatności</string>
     <string name="po_card_tokenization_error_card">Niepoprawne dane karty.</string>
     <string name="po_card_tokenization_error_card_expiration">Data ważności karty jest nieprawidłowa.</string>
     <string name="po_card_tokenization_error_card_number">Nieprawidłowy numer karty.</string>
diff --git a/sdk/src/main/res/values-pt/strings.xml b/sdk/src/main/res/values-pt/strings.xml
index 4ba26483..9f13237a 100644
--- a/sdk/src/main/res/values-pt/strings.xml
+++ b/sdk/src/main/res/values-pt/strings.xml
@@ -49,6 +49,7 @@
     <string name="po_card_tokenization_card_details_number_placeholder">4242 4242 4242 4242</string>
     <string name="po_card_tokenization_billing_address_title">Morada de faturação</string>
     <string name="po_card_tokenization_billing_address_street">Endereço %d</string>
+    <string name="po_card_tokenization_save_card">Guardar este cartão para futuros pagamentos</string>
     <string name="po_card_tokenization_error_card">Os dados do seu cartão são inválidos.</string>
     <string name="po_card_tokenization_error_card_expiration">A data de validade do seu cartão é inválida.</string>
     <string name="po_card_tokenization_error_card_number">O número do seu cartão é inválido.</string>
diff --git a/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/CardTokenizationInteractor.kt b/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/CardTokenizationInteractor.kt
index e61fd204..51419de8 100644
--- a/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/CardTokenizationInteractor.kt
+++ b/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/CardTokenizationInteractor.kt
@@ -615,6 +615,7 @@ internal class CardTokenizationInteractor(
             eventDispatcher.completion.collect { result ->
                 result.onSuccess {
                     _state.value.tokenizedCard?.let { card ->
+                        dispatch(DidComplete)
                         complete(Success(card))
                     }.orElse {
                         val failure = ProcessOutResult.Failure(
diff --git a/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/POCardTokenizationConfiguration.kt b/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/POCardTokenizationConfiguration.kt
index 8d419f3d..4a4ba59f 100644
--- a/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/POCardTokenizationConfiguration.kt
+++ b/ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/POCardTokenizationConfiguration.kt
@@ -4,7 +4,6 @@ import android.os.Parcelable
 import androidx.annotation.ColorRes
 import com.processout.sdk.api.model.request.POContact
 import com.processout.sdk.ui.card.tokenization.POCardTokenizationConfiguration.BillingAddressConfiguration.CollectionMode
-import com.processout.sdk.ui.core.annotation.ProcessOutInternalApi
 import com.processout.sdk.ui.core.style.*
 import com.processout.sdk.ui.shared.configuration.POCancellationConfiguration
 import kotlinx.parcelize.Parcelize
@@ -29,7 +28,7 @@ data class POCardTokenizationConfiguration(
     val cvcRequired: Boolean = true,
     val isCardholderNameFieldVisible: Boolean = true,
     val billingAddress: BillingAddressConfiguration = BillingAddressConfiguration(),
-    @ProcessOutInternalApi val savingAllowed: Boolean = false,
+    val savingAllowed: Boolean = false,
     val primaryActionText: String? = null,
     val secondaryActionText: String? = null,
     val cancellation: POCancellationConfiguration = POCancellationConfiguration(),