diff --git a/src/common/wui_api.c b/src/common/wui_api.c
index 7b36b32dbe..e08ad69f15 100644
--- a/src/common/wui_api.c
+++ b/src/common/wui_api.c
@@ -246,6 +246,7 @@ time_t sntp_get_system_time(void) {
         system_time.tm_mday = currDate.Date;
         system_time.tm_mon = currDate.Month;
         system_time.tm_year = currDate.Year;
+        system_time.tm_wday = currDate.WeekDay;
         secs = mktime(&system_time);
         return secs;
     } else {
diff --git a/src/gui/screen_printing.cpp b/src/gui/screen_printing.cpp
index 355eb05251..ad98478206 100644
--- a/src/gui/screen_printing.cpp
+++ b/src/gui/screen_printing.cpp
@@ -510,7 +510,7 @@ static void update_end_timestamp(screen_t *screen, time_t now_sec, uint16_t prin
         strftime(pw->text_etime.data(), MAX_END_TIMESTAMP_SIZE, "Today at %H:%MM", &print_end);
     } else if (tommorow.tm_mday == print_end.tm_mday && // if print end is tommorow
         tommorow.tm_mon == print_end.tm_mon && tommorow.tm_year == print_end.tm_year) {
-        strftime(pw->text_etime.data(), MAX_END_TIMESTAMP_SIZE, "Tommorow at %H:%MM", &print_end);
+        strftime(pw->text_etime.data(), MAX_END_TIMESTAMP_SIZE, "%a at %H:%MM", &print_end);
     } else {
         strftime(pw->text_etime.data(), MAX_END_TIMESTAMP_SIZE, "%m-%d at %H:%MM", &print_end);
     }