diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index b4c81b8f9..4ffa88c99 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -608,13 +608,13 @@ void MMU2::ReportError(ErrorCode ec) {
     if( ec != lastErrorCode ){ // deduplicate: only report changes in error codes into the log
         lastErrorCode = ec;
 
-        // Log error format: MMU2:E=32766 TextDescription
+        // Log error format: MMU2:E=32766 ErrorTitle TextDescription
 
         // The longest error description in errors_list.h is 144 bytes.
         // and the longest error title is 20 bytes. msg buffer needs
         // to have enough space to fit both.
         char msg[192];
-        int len = snprintf(msg, sizeof(msg), "MMU2:E=%hu", (uint16_t)ec);
+        int len = snprintf(msg, sizeof(msg), "MMU2:E=%hu ", (uint16_t)ec);
         // Append a human readable form of the error code(s)
         TranslateErr((uint16_t)ec, &msg[len], 192 - len);
 
diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp
index cb3d21ec6..08b1853e8 100644
--- a/Firmware/mmu2_error_converter.cpp
+++ b/Firmware/mmu2_error_converter.cpp
@@ -2,6 +2,7 @@
 #include "mmu2/error_codes.h"
 #include "mmu2/errors_list.h"
 #include "language.h"
+#include <stdio.h>
 
 namespace MMU2 {
 
@@ -92,8 +93,11 @@ void TranslateErr(uint16_t ec, char *dst, size_t dstSize) {
     uint16_t ei = MMUErrorCodeIndex(ec);
     // just to prevent the compiler from stripping the data structures from the final binary for now
     *dst = errorButtons[ei];
-    strncpy_P(dst + 1, static_cast<const char * const>(pgm_read_ptr(&errorTitles[ei])), dstSize);
-    strncat_P(dst, static_cast<const char * const>(pgm_read_ptr(&errorDescs[ei])), dstSize);
+    snprintf(
+        dst, dstSize, "%S %S",
+        static_cast<const char * const>(pgm_read_ptr(&errorTitles[ei])),
+        static_cast<const char * const>(pgm_read_ptr(&errorDescs[ei]))
+    );
 }
 
 } // namespace MMU2