diff --git a/components/gateway_knx/oam_knxprod/Gateway-OAM-IP-Router.xml b/components/gateway_knx/oam_knxprod/Gateway-OAM-IP-Router.xml
index 9ffa517..a9143ed 100644
--- a/components/gateway_knx/oam_knxprod/Gateway-OAM-IP-Router.xml
+++ b/components/gateway_knx/oam_knxprod/Gateway-OAM-IP-Router.xml
@@ -4,6 +4,7 @@
   <op:config name="%IsSecureEnabled%" value="true" />
   <op:config name="%NET_IPConfigTool%" value="1" />
   <op:config name="%Tunnelcount%" value="16" />
+  <op:config name="%MaxUserEntries%" value="17" />
   <op:config name="%NET_ServiceNTP%" value="1" />
   <op:config name="%SecurityProxyGroupKeyTableEntries%" value="3000" />
 
diff --git a/components/gateway_knx/oam_knxprod/Gateway-SecureTemplateRouter.xml b/components/gateway_knx/oam_knxprod/Gateway-SecureTemplateRouter.xml
index 343269e..c4cdd2f 100644
--- a/components/gateway_knx/oam_knxprod/Gateway-SecureTemplateRouter.xml
+++ b/components/gateway_knx/oam_knxprod/Gateway-SecureTemplateRouter.xml
@@ -9,7 +9,7 @@
       </Catalog>
       <ApplicationPrograms>
         <op:version OpenKnxId="%OpenKnxId%" ApplicationNumber="%ApplicationNumber%" ApplicationVersion="%ApplicationVersion%" ReplacesVersions="%ReplacesVersions%" ApplicationRevision="%ApplicationRevision%" FirmwareRevision="%FirmwareRevision%" />
-        <ApplicationProgram Id="%AID%" ProgramType="ApplicationProgram" MaskVersion="%MaskVersion%" Name="%ApplicationName%%BuildSuffix%" LoadProcedureStyle="MergedProcedure" PeiType="0" DefaultLanguage="en-US" IsSecureEnabled="%IsSecureEnabled%" MaxSecurityGroupKeyTableEntries="3000" MaxSecurityIndividualAddressEntries="1000" MaxSecurityProxyGroupKeyTableEntries="%SecurityProxyGroupKeyTableEntries%" DynamicTableManagement="false" Linkable="false" MinEtsVersion="6.0" ContextHelpFile="%FILE-HELP-de%" IconFile="%FILE-ICONS%" IPConfig="Custom" ApplicationNumber="0" ApplicationVersion="0" ReplacesVersions="0" AdditionalAddressesCount="%Tunnelcount%" MaxTunnelingUserEntries="%Tunnelcount%">
+        <ApplicationProgram Id="%AID%" ProgramType="ApplicationProgram" MaskVersion="%MaskVersion%" Name="%ApplicationName%%BuildSuffix%" LoadProcedureStyle="MergedProcedure" PeiType="0" DefaultLanguage="en-US" IsSecureEnabled="%IsSecureEnabled%" MaxUserEntries="%MaxUserEntries%" MaxSecurityGroupKeyTableEntries="3000" MaxSecurityIndividualAddressEntries="1000" MaxSecurityProxyGroupKeyTableEntries="%SecurityProxyGroupKeyTableEntries%" DynamicTableManagement="false" Linkable="false" MinEtsVersion="6.0" ContextHelpFile="%FILE-HELP-de%" IconFile="%FILE-ICONS%" IPConfig="Custom" ApplicationNumber="0" ApplicationVersion="0" ReplacesVersions="0" AdditionalAddressesCount="%Tunnelcount%" MaxTunnelingUserEntries="%Tunnelcount%">
           <Static>
             <Code>
               <AbsoluteSegment Id="%AID%_AS-0100" Address="256" Size="256" />
@@ -106,14 +106,6 @@
       </Hardware>
       <Languages>
         <Language Identifier="zh-CN">
-          <TranslationUnit RefId="M-00FA_CS-OpenKNX">
-            <TranslationElement RefId="M-00FA_CS-OpenKNX">
-              <Translation AttributeName="Name" Text="OpenKNX" />
-            </TranslationElement>
-            <TranslationElement RefId="%CatalogItemId%">
-              <Translation AttributeName="Name" Text="OpenKNX: 网关 OAM IP 路由器%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
           <TranslationUnit RefId="%AID%">
             <TranslationElement RefId="%AID%">
               <Translation AttributeName="Name" Text="网关 OAM IP 路由器%BuildSuffix%" />
@@ -191,24 +183,8 @@
             <TranslationElement RefId="%AID%_P-9916002"><Translation AttributeName="Text" Text="隧道 16 的 IP 地址" /></TranslationElement>
             <TranslationElement RefId="%AID%_P-9916003"><Translation AttributeName="Text" Text="隧道忙碌时的行为" /></TranslationElement>
           </TranslationUnit>
-          <TranslationUnit RefId="%HardwareId%">
-            <TranslationElement RefId="%HardwareId%">
-              <Translation AttributeName="Name" Text="OpenKNX-网关 OAM IP 路由器%BuildSuffix%" />
-            </TranslationElement>
-            <TranslationElement RefId="%ProductId%">
-              <Translation AttributeName="Text" Text="OpenKNX: 网关 OAM IP 路由器%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
         </Language>
         <Language Identifier="de-DE">
-          <TranslationUnit RefId="M-00FA_CS-OpenKNX">
-            <TranslationElement RefId="M-00FA_CS-OpenKNX">
-              <Translation AttributeName="Name" Text="OpenKNX" />
-            </TranslationElement>
-            <TranslationElement RefId="%CatalogItemId%">
-              <Translation AttributeName="Name" Text="OpenKNX: Gateway OAM IP-Router%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
           <TranslationUnit RefId="%AID%">
             <TranslationElement RefId="%AID%">
               <Translation AttributeName="Name" Text="Gateway OAM IP-Router%BuildSuffix%" />
@@ -286,24 +262,8 @@
             <TranslationElement RefId="%AID%_P-9916002"><Translation AttributeName="Text" Text="IP-Adresse für Tunnel 16" /></TranslationElement>
             <TranslationElement RefId="%AID%_P-9916003"><Translation AttributeName="Text" Text="Verhalten bei belegtem Tunnel" /></TranslationElement>
           </TranslationUnit>
-          <TranslationUnit RefId="%HardwareId%">
-            <TranslationElement RefId="%HardwareId%">
-              <Translation AttributeName="Name" Text="OpenKNX-Gateway OAM IP-Router%BuildSuffix%" />
-            </TranslationElement>
-            <TranslationElement RefId="%ProductId%">
-              <Translation AttributeName="Text" Text="OpenKNX: Gateway OAM IP-Router%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
         </Language>
         <Language Identifier="ja-JP">
-          <TranslationUnit RefId="M-00FA_CS-OpenKNX">
-            <TranslationElement RefId="M-00FA_CS-OpenKNX">
-              <Translation AttributeName="Name" Text="OpenKNX" />
-            </TranslationElement>
-            <TranslationElement RefId="%CatalogItemId%">
-              <Translation AttributeName="Name" Text="OpenKNX: ゲートウェイ OAM IP ルーター%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
           <TranslationUnit RefId="%AID%">
             <TranslationElement RefId="%AID%">
               <Translation AttributeName="Name" Text="ゲートウェイ OAM IP ルーター%BuildSuffix%" />
@@ -381,14 +341,6 @@
             <TranslationElement RefId="%AID%_P-9916002"><Translation AttributeName="Text" Text="トンネル 16 の IP アドレス" /></TranslationElement>
             <TranslationElement RefId="%AID%_P-9916003"><Translation AttributeName="Text" Text="トンネル使用中の動作" /></TranslationElement>
           </TranslationUnit>
-          <TranslationUnit RefId="%HardwareId%">
-            <TranslationElement RefId="%HardwareId%">
-              <Translation AttributeName="Name" Text="OpenKNX-ゲートウェイ OAM IP ルーター%BuildSuffix%" />
-            </TranslationElement>
-            <TranslationElement RefId="%ProductId%">
-              <Translation AttributeName="Text" Text="OpenKNX: ゲートウェイ OAM IP ルーター%BuildSuffixText%" />
-            </TranslationElement>
-          </TranslationUnit>
         </Language>
       </Languages>
     </Manufacturer>