diff --git a/CHANGELOG.md b/CHANGELOG.md
index a21cbc580..ea6db76d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Add a `Logs` menu entry in `Settings Window`, it provides send, remove, activate buttons...
 - Supports EXIF orientation for file transfer images preview.
 - Echo canceller supports 48kHz.
+- Better GUI when a proxy config is modified in `Settings Window`.
 
 ### Fixes
 
diff --git a/assets/languages/en.ts b/assets/languages/en.ts
index 281b50462..5e4627089 100644
--- a/assets/languages/en.ts
+++ b/assets/languages/en.ts
@@ -1319,6 +1319,18 @@ your friend&apos;s SIP address or username.</translation>
         <source>confirm</source>
         <translation>CONFIRM</translation>
     </message>
+    <message>
+        <source>invalidSipAddress</source>
+        <translation>Invalid sip address.</translation>
+    </message>
+    <message>
+        <source>invalidServerAddress</source>
+        <translation>Invalid server address.</translation>
+    </message>
+    <message>
+        <source>invalidRoute</source>
+        <translation>Invalid route.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>
diff --git a/assets/languages/fr.ts b/assets/languages/fr.ts
index 0c9f5defa..b77ec8b69 100644
--- a/assets/languages/fr.ts
+++ b/assets/languages/fr.ts
@@ -1317,6 +1317,18 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
         <source>confirm</source>
         <translation>CONFIRMER</translation>
     </message>
+    <message>
+        <source>invalidSipAddress</source>
+        <translation>Adresse sip invalide.</translation>
+    </message>
+    <message>
+        <source>invalidServerAddress</source>
+        <translation>Adresse du serveur invalide.</translation>
+    </message>
+    <message>
+        <source>invalidRoute</source>
+        <translation>Route invalide.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsUi</name>
diff --git a/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml b/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml
index 596fe2ad2..e9f252166 100644
--- a/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml
+++ b/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml
@@ -52,6 +52,8 @@ DialogPlus {
         TextField {
           id: sipAddress
 
+          error: dialog._sipAddressOk ? '' : qsTr('invalidSipAddress')
+
           onTextChanged: Logic.handleSipAddressChanged(text)
         }
       }
@@ -64,6 +66,8 @@ DialogPlus {
         TextField {
           id: serverAddress
 
+          error: dialog._serverAddressOk ? '' : qsTr('invalidServerAddress')
+
           onTextChanged: Logic.handleServerAddressChanged(text)
         }
       }
@@ -101,6 +105,8 @@ DialogPlus {
         TextField {
           id: route
 
+          error: dialog._routeOk ? '' : qsTr('invalidRoute')
+
           onTextChanged: Logic.handleRouteChanged(text)
         }
       }