diff --git a/apps/settings.h b/apps/settings.h
index 1df1e0b418..056f40df6a 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -803,6 +803,7 @@ struct user_settings
 #ifdef HAVE_REMOTE_LCD
     unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */
 #endif
+    char player_name[64];  /* Name of the local player */
 
     struct compressor_settings compressor_settings;
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 09a45f1faa..98e8dec5a8 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -998,7 +998,7 @@ const struct settings_list settings[] = {
                   play_frequency, LANG_FREQUENCY, 0, "playback frequency", "auto",
                   UNIT_KHZ, formatter_freq_unit_0_is_auto,
                   getlang_freq_unit_0_is_auto,
-                  playback_frequency_callback, 
+                  playback_frequency_callback,
 #if HAVE_PLAY_FREQ >= 192
                   7,0,SAMPR_44,SAMPR_48,SAMPR_88,SAMPR_96,SAMPR_176,SAMPR_192),
 #elif HAVE_PLAY_FREQ >= 96
@@ -1883,7 +1883,7 @@ const struct settings_list settings[] = {
 #ifdef HAVE_BACKLIGHT
     CHOICE_SETTING(0, backlight_on_button_hold,
                    LANG_BACKLIGHT_ON_BUTTON_HOLD,
-#ifdef HAS_BUTTON_HOLD                   
+#ifdef HAS_BUTTON_HOLD
                    1,
 #else
                    0,
@@ -2217,6 +2217,8 @@ const struct settings_list settings[] = {
     VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"),
 #endif
 
+    TEXT_SETTING(F_THEMESETTING, player_name, "player name", "", NULL, NULL),
+
 #ifdef HAVE_MORSE_INPUT
     OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL),
 #endif
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index c4318692c4..b3e4363815 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -384,6 +384,7 @@
       clear settings on hold
                 & off, on               & N/A\\
     }%
+    player name & freeform text, defaults to an empty string & N/A\\
     \bottomrule
   \end{longtable}
 \end{center}