diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index a5cb65f71..3b74cad53 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -579,6 +579,34 @@ Server url not configured.</translation>
         <source>transportTitle</source>
         <translation>Transport</translation>
     </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT and Firewall</translation>
+    </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>Enable ICE</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>STUN/TURN server</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>Enable TURN</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>TURN user</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>TURN password</translation>
+    </message>
+    <message>
+        <source>networkProtocolAndPortsTitle</source>
+        <translation>Network protocol and Ports</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWindow</name>
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index f5112358d..1596e109e 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -589,6 +589,34 @@ Url du serveur non configurée.</translation>
         <source>transportTitle</source>
         <translation>Transport</translation>
     </message>
+    <message>
+        <source>natAndFirewallTitle</source>
+        <translation>NAT et Pare-feu</translation>
+    </message>
+    <message>
+        <source>enableIceLabel</source>
+        <translation>Activer ICE</translation>
+    </message>
+    <message>
+        <source>stunServerLabel</source>
+        <translation>Serveur STUN/TURN</translation>
+    </message>
+    <message>
+        <source>enableTurnLabel</source>
+        <translation>Activer TURN</translation>
+    </message>
+    <message>
+        <source>turnUserLabel</source>
+        <translation>Utilisateur TURN</translation>
+    </message>
+    <message>
+        <source>turnPasswordLabel</source>
+        <translation>Mot de passe TURN</translation>
+    </message>
+    <message>
+        <source>networkProtocolAndPortsTitle</source>
+        <translation>Protocol réseau et ports</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWindow</name>
diff --git a/linphone-desktop/ui/modules/Common/Form/FormGroup.qml b/linphone-desktop/ui/modules/Common/Form/FormGroup.qml
index a08b0425a..045c2abc1 100644
--- a/linphone-desktop/ui/modules/Common/Form/FormGroup.qml
+++ b/linphone-desktop/ui/modules/Common/Form/FormGroup.qml
@@ -32,12 +32,12 @@ RowLayout {
     id: content
 
     Layout.alignment: {
-      var height = _content[0].height
+      var height = _content[0] ? _content[0].height : 0
       return height < label.height ? Qt.AlignVCenter : Qt.AlignTop
     }
 
     Layout.maximumWidth: FormGroupStyle.content.width
-    Layout.preferredHeight: _content[0].height
+    Layout.preferredHeight: _content[0] ? _content[0].height : 0
     Layout.preferredWidth: FormGroupStyle.content.width
   }
 }
diff --git a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml
index ef2eb4e5c..014719edb 100644
--- a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml
+++ b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml
@@ -54,5 +54,73 @@ TabContainer {
     // Network protocol and ports.
     // -------------------------------------------------------------------------
 
+    Form {
+      title: qsTr('networkProtocolAndPortsTitle')
+      width: parent.width
+
+      FormLine {
+
+      }
+    }
+
+    // -------------------------------------------------------------------------
+    // NAT and Firewall.
+    // -------------------------------------------------------------------------
+
+    Form {
+      title: qsTr('natAndFirewallTitle')
+      width: parent.width
+
+      FormLine {
+        FormGroup {
+          label: qsTr('enableIceLabel')
+
+          Switch {
+            id: enableIce
+          }
+        }
+
+        FormGroup {
+          label: qsTr('stunServerLabel')
+
+          TextField {
+            readOnly: !enableIce.checked
+          }
+        }
+      }
+
+      FormLine {
+        FormGroup {
+          label: qsTr('enableTurnLabel')
+
+          Switch {
+            id: enableTurn
+          }
+        }
+
+        FormGroup {
+          label: qsTr('turnUserLabel')
+
+          TextField {
+            readOnly: !enableTurn.checked
+          }
+        }
+      }
+
+      FormLine {
+        FormGroup {
+          label: ''
+        }
+
+        FormGroup {
+          label: qsTr('turnPasswordLabel')
+
+          TextField {
+            echoMode: TextInput.Password
+            readOnly: !enableTurn.checked
+          }
+        }
+      }
+    }
   }
 }