diff --git a/ChangeLog.md b/ChangeLog.md
index a7840e7fc..1e08a2cc1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -32,6 +32,8 @@
 ### Fixed:
 - Storage: Fix process aliases in rename (by @Willy-JL)
 - Desktop: Show "safe to unplug the USB cable" even when locked (by @Willy-JL)
+- UL: RFID: Electra fix non-initialized encoded epilogue on render (by @Leptopt1los)
+- OFW: NFC: Fix changing UID (by @gornekich)
 - OFW: Settings: Refactor fixes (by @Astrrra)
 - OFW: GUI: Fix calling both `view_free_model()` and `view_free()` (by @Willy-JL)
 - OFW: Archive: Fix condition race on exit (by @skotopes)
diff --git a/applications/main/archive/archive.c b/applications/main/archive/archive.c
index 394de1eae..432417c6e 100644
--- a/applications/main/archive/archive.c
+++ b/applications/main/archive/archive.c
@@ -21,16 +21,14 @@ static void archive_tick_event_callback(void* context) {
 static ArchiveApp* archive_alloc(void) {
     ArchiveApp* archive = malloc(sizeof(ArchiveApp));
 
+    archive->gui = furi_record_open(RECORD_GUI);
     archive->loader = furi_record_open(RECORD_LOADER);
-
     archive->fav_move_str = furi_string_alloc();
     archive->file_extension = furi_string_alloc();
 
     archive->scene_manager = scene_manager_alloc(&archive_scene_handlers, archive);
     archive->view_dispatcher = view_dispatcher_alloc();
 
-    archive->gui = furi_record_open(RECORD_GUI);
-
     ViewDispatcher* view_dispatcher = archive->view_dispatcher;
     view_dispatcher_enable_queue(view_dispatcher);
     view_dispatcher_set_event_callback_context(view_dispatcher, archive);
diff --git a/lib/lfrfid/protocols/protocol_electra.c b/lib/lfrfid/protocols/protocol_electra.c
index fabf7ce6b..29223a43d 100644
--- a/lib/lfrfid/protocols/protocol_electra.c
+++ b/lib/lfrfid/protocols/protocol_electra.c
@@ -411,6 +411,7 @@ bool protocol_electra_write_data(ProtocolElectra* protocol, void* data) {
 };
 
 void protocol_electra_render_data(ProtocolElectra* protocol, FuriString* result) {
+    protocol_electra_encoder_start(protocol);
     furi_string_printf(result, "Epilogue: %016llX", protocol->encoded_epilogue);
 };
 
diff --git a/lib/nfc/SConscript b/lib/nfc/SConscript
index 705204106..4fb49f792 100644
--- a/lib/nfc/SConscript
+++ b/lib/nfc/SConscript
@@ -34,8 +34,8 @@ env.Append(
         File("protocols/mf_ultralight/mf_ultralight_poller.h"),
         File("protocols/mf_classic/mf_classic_poller.h"),
         File("protocols/mf_desfire/mf_desfire_poller.h"),
-        File("protocols/emv/emv_poller.h"),
         File("protocols/slix/slix_poller.h"),
+        File("protocols/emv/emv_poller.h"),
         File("protocols/st25tb/st25tb_poller.h"),
         File("protocols/felica/felica_poller.h"),
         # Listeners