diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index aede89f47a..d4405cfb30 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2161,7 +2161,11 @@
 <!--  gxp - Downloaded Language -->
 <!--  String -->
 <!--  Mandatory -->
+{if isset($grandstream_display_language) }
+<P1362>{$grandstream_display_language}</P1362>
+{else}
 <P1362>auto</P1362>
+{/if}
 <!--  Language File postfix (for Downloaded Language) -->
 <!--  String -->
 <P399></P399>