diff --git a/apps/inheritance_app/inheritance_decrypt_data.c b/apps/inheritance_app/inheritance_decrypt_data.c
index 3304a1e0d..b3f2a4613 100644
--- a/apps/inheritance_app/inheritance_decrypt_data.c
+++ b/apps/inheritance_app/inheritance_decrypt_data.c
@@ -260,7 +260,7 @@ static void decryption_handle_errors() {
   if (decryption_error.type == DECRYPTION_OK) {
     return;
   }
-  LOG_ERROR("inheritance_encrypt_data Error Code:%d Flow Tag:%d ",
+  LOG_ERROR("inheritance_decrypt_data Error Code:%d Flow Tag:%d ",
             decryption_error.type,
             decryption_error.flow);
   decryption_error_type_e type = decryption_error.type;
diff --git a/apps/inheritance_app/inheritance_encrypt_data.c b/apps/inheritance_app/inheritance_encrypt_data.c
index 8a3a4cbdc..4d6e28a3b 100644
--- a/apps/inheritance_app/inheritance_encrypt_data.c
+++ b/apps/inheritance_app/inheritance_encrypt_data.c
@@ -663,6 +663,7 @@ static bool encrypt_data(void) {
       status = false;
       break;
     }
+    set_app_flow_status(INHERITANCE_ENCRYPT_DATA_STATUS_PIN_ENTERED);
 
     if (!serialize_message_data()) {
       status = false;
@@ -673,6 +674,7 @@ static bool encrypt_data(void) {
       status = false;
       break;
     }
+    set_app_flow_status(INHERITANCE_ENCRYPT_DATA_STATUS_MESSAGE_ENCRYPTED);
 
     if (!serialize_packet()) {
       status = false;