diff --git a/content/self-host/client-configuration/_index.en.md b/content/self-host/client-configuration/_index.en.md
index 58ad5ff..6620dce 100644
--- a/content/self-host/client-configuration/_index.en.md
+++ b/content/self-host/client-configuration/_index.en.md
@@ -1,8 +1,7 @@
 ---
-title: Self-host
-weight: 200
-pre: "<b>2. </b>"
-chapter: true
+title: Client Configuration
+weight: 300
+pre: "<b>2.3 </b>"
 ---
 
 ### Overview
@@ -15,18 +14,42 @@ In the main RustDesk Client home click on the 3 dots next to your ID then click
 
 ![image](/docs/en/self-host/client-configuration/images/network-config.png)
 
+Enter the `hbbs` host or IP Address in the **ID Server** input box (local side + remote side). The other two addresses can be left blank, RustDesk will automatically deduce (if not specially set), and the Relay Server refers to `hbbr` (port 21117).
+
+e.g.
+
+```nolang
+hbbs.example.com
+```
+
+or
+
+```nolang
+hbbs.example.com:21116
+```
+
+
+
 ### Automatic Config
 
 The easiest way to setup automatically is using deployment scripts found [here](/docs/en/client/client-deployment/)
 
 You can fix the Password is required and use a reverse base64 string in the format `{"host":"HOSTADDRESS","key":"HOSTKEY","api":"http://HOSTADDRESS:21114"` to automatically configure the clients, this is available automatically with RustDesk Server Pro via the console.
 
+#### Put config in rustdesk.exe file name (Windows only)
 
-### URL
+Change `rustdesk.exe` to rustdesk-`host=<host-ip-or-name>,key=<public-key-string>`.exe, e.g. rustdesk-`host=192.168.1.137,key=xfdsfsd32=32`.exe. You can see the config result in the About Window below.
 
-To ease integration with other systems you can call RustDesk using a URL, it should be in the following format
-
-`rustdesk://connection/new/agentid?password=agentpassword`
+<a name="invalidchar"></a>
+{{% notice note %}}
+You need to set both `host` and `key`, missing either one will not work.
 
+Optionally add a `,` (comma) character after the key, before the `.exe` part as a delimiter, to avoid the key being mangled if Windows or the browser renames the file when downloading duplicated names.
+
+If there are invalid characters in the key which can not be used in a Windows file name, please remove the
+`id_ed25519` file from your server and restart `hbbs`/`hbbr`. This will cause the `id_ed25519.pub` file to regenerate. You may need to
+repeat this process until you get valid characters.
+{{% /notice %}}
 
 
+### [Hardcoding](/docs/en/self-host/client-configuration/hardcode-settings/)
diff --git a/content/self-host/rustdesk-server-oss/hardcode-settings/_index.de.md b/content/self-host/client-configuration/hardcode-settings/_index.de.md
similarity index 100%
rename from content/self-host/rustdesk-server-oss/hardcode-settings/_index.de.md
rename to content/self-host/client-configuration/hardcode-settings/_index.de.md
diff --git a/content/self-host/rustdesk-server-oss/hardcode-settings/_index.en.md b/content/self-host/client-configuration/hardcode-settings/_index.en.md
similarity index 100%
rename from content/self-host/rustdesk-server-oss/hardcode-settings/_index.en.md
rename to content/self-host/client-configuration/hardcode-settings/_index.en.md
diff --git a/content/self-host/rustdesk-server-oss/hardcode-settings/_index.fr.md b/content/self-host/client-configuration/hardcode-settings/_index.fr.md
similarity index 100%
rename from content/self-host/rustdesk-server-oss/hardcode-settings/_index.fr.md
rename to content/self-host/client-configuration/hardcode-settings/_index.fr.md
diff --git a/content/self-host/rustdesk-server-oss/hardcode-settings/_index.nl.md b/content/self-host/client-configuration/hardcode-settings/_index.nl.md
similarity index 100%
rename from content/self-host/rustdesk-server-oss/hardcode-settings/_index.nl.md
rename to content/self-host/client-configuration/hardcode-settings/_index.nl.md
diff --git a/content/self-host/rustdesk-server-oss/hardcode-settings/_index.zh-cn.md b/content/self-host/client-configuration/hardcode-settings/_index.zh-cn.md
similarity index 100%
rename from content/self-host/rustdesk-server-oss/hardcode-settings/_index.zh-cn.md
rename to content/self-host/client-configuration/hardcode-settings/_index.zh-cn.md
diff --git a/content/self-host/rustdesk-server-oss/_index.en.md b/content/self-host/rustdesk-server-oss/_index.en.md
index fd9904d..935e4cf 100755
--- a/content/self-host/rustdesk-server-oss/_index.en.md
+++ b/content/self-host/rustdesk-server-oss/_index.en.md
@@ -1,6 +1,6 @@
 ---
 title: RustDesk Server OSS
-weight: 7
+weight: 100
 pre: "<b>2.1. </b>"
 ---
 
diff --git a/content/self-host/rustdesk-server-pro/_index.en.md b/content/self-host/rustdesk-server-pro/_index.en.md
index 964d205..4656376 100644
--- a/content/self-host/rustdesk-server-pro/_index.en.md
+++ b/content/self-host/rustdesk-server-pro/_index.en.md
@@ -1,6 +1,6 @@
 ---
 title: RustDesk Server Pro
-weight: 2
+weight: 200
 pre: "<b>2.2. </b>"
 ---