diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index ac6f8638a..d7681a9e8 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -49,6 +49,32 @@
             ]
         },
 
+        {
+            "name"  : "gateway",
+            "fields" : [
+                {
+                    "name"  : "gateway-hostname",
+                    "type"  : "TEXT"
+                },
+                {
+                    "name"  : "gateway-port",
+                    "type"  : "NUMERIC"
+                },
+                {
+                    "name"  : "gateway-username",
+                    "type"  : "USERNAME"
+                },
+                {
+                    "name"  : "gateway-password",
+                    "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "gateway-domain",
+                    "type"  : "TEXT"
+                }
+            ]
+        },
+
         {
             "name"  : "basic-parameters",
             "fields" : [
@@ -228,6 +254,16 @@
             ]
         },
 
+        {
+            "name"  : "load-balancing",
+            "fields" : [
+                {
+                    "name"  : "load-balance-info",
+                    "type"  : "TEXT"
+                }
+            ]
+        },
+
         {
             "name" : "recording",
             "fields" : [
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index 9bdf78730..940340281 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -302,6 +302,11 @@
         "FIELD_HEADER_ENABLE_SFTP"                : "Aktiviere SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"             : "Aktiviere Theming:",
         "FIELD_HEADER_ENABLE_WALLPAPER"           : "Aktiviere Desktophintergrund:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Domäne:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Hostname:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Passwort:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Port:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Benutzername:",
         "FIELD_HEADER_HEIGHT"          : "Höhe:",
         "FIELD_HEADER_HOSTNAME"        : "Hostname:",
         "FIELD_HEADER_IGNORE_CERT"     : "Server Zertifikat ignorieren:",
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index d92c3e237..512524a89 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -330,10 +330,16 @@
         "FIELD_HEADER_ENABLE_SFTP"     : "Enable SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"             : "Enable theming:",
         "FIELD_HEADER_ENABLE_WALLPAPER"           : "Enable wallpaper:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Domain:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Hostname:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Password:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Port:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Username:",
         "FIELD_HEADER_HEIGHT"          : "Height:",
         "FIELD_HEADER_HOSTNAME"        : "Hostname:",
         "FIELD_HEADER_IGNORE_CERT"     : "Ignore server certificate:",
         "FIELD_HEADER_INITIAL_PROGRAM" : "Initial program:",
+        "FIELD_HEADER_LOAD_BALANCE_INFO" : "Load balance info/cookie:",
         "FIELD_HEADER_PASSWORD"        : "Password:",
         "FIELD_HEADER_PORT"            : "Port:",
         "FIELD_HEADER_PRECONNECTION_BLOB" : "Preconnection BLOB (VM ID):",
@@ -390,6 +396,8 @@
         "SECTION_HEADER_BASIC_PARAMETERS"   : "Basic Settings",
         "SECTION_HEADER_DEVICE_REDIRECTION" : "Device Redirection",
         "SECTION_HEADER_DISPLAY"            : "Display",
+        "SECTION_HEADER_GATEWAY"            : "Remote Desktop Gateway",
+        "SECTION_HEADER_LOAD_BALANCING"     : "Load Balancing",
         "SECTION_HEADER_NETWORK"            : "Network",
         "SECTION_HEADER_PERFORMANCE"        : "Performance",
         "SECTION_HEADER_PRECONNECTION_PDU"  : "Preconnection PDU / Hyper-V",
diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json
index ca4a5bdc5..d59c38406 100644
--- a/guacamole/src/main/webapp/translations/fr.json
+++ b/guacamole/src/main/webapp/translations/fr.json
@@ -302,6 +302,11 @@
         "FIELD_HEADER_ENABLE_SFTP"     : "Activer SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"  : "Activer thématisation:",
         "FIELD_HEADER_ENABLE_WALLPAPER" : "Activer fond d'écran:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Nom du domaine:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Nom d'hôte:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Mot de passe:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Port:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Identifiant:",
         "FIELD_HEADER_HEIGHT"          : "Hauteur:",
         "FIELD_HEADER_HOSTNAME"        : "Nom d'hôte:",
         "FIELD_HEADER_IGNORE_CERT"     : "Ignorer le certificat du serveur:",
diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json
index da1df107a..7cc867b74 100644
--- a/guacamole/src/main/webapp/translations/nl.json
+++ b/guacamole/src/main/webapp/translations/nl.json
@@ -303,6 +303,11 @@
         "FIELD_HEADER_ENABLE_SFTP"     : "Inschakelen SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"             : "Inschakelen thema's:",
         "FIELD_HEADER_ENABLE_WALLPAPER"           : "Inschakelen achtergrond:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Domein:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Servernaam:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Password:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Poort:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Gebruikersnaam:",
         "FIELD_HEADER_HEIGHT"          : "Hoogte:",
         "FIELD_HEADER_HOSTNAME"        : "Servernaam:",
         "FIELD_HEADER_IGNORE_CERT"     : "Negeer server certificaat:",
diff --git a/guacamole/src/main/webapp/translations/no.json b/guacamole/src/main/webapp/translations/no.json
index 694e7344c..8b20b5d84 100644
--- a/guacamole/src/main/webapp/translations/no.json
+++ b/guacamole/src/main/webapp/translations/no.json
@@ -287,6 +287,11 @@
         "FIELD_HEADER_ENABLE_SFTP"     : "Aktiver SFTP:",
         "FIELD_HEADER_ENABLE_THEMING"             : "Aktiver tema:",
         "FIELD_HEADER_ENABLE_WALLPAPER"           : "Ativer bakgrunnsbilde:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Domene:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Vertsnavn:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Passord:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Port:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Brukernavn:",
         "FIELD_HEADER_HEIGHT"          : "Høyde:",
         "FIELD_HEADER_HOSTNAME"        : "Vertsnavn:",
         "FIELD_HEADER_IGNORE_CERT"     : "Ignorer serversertifikat:",
diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json
index 5e305a580..0e47f60d2 100644
--- a/guacamole/src/main/webapp/translations/ru.json
+++ b/guacamole/src/main/webapp/translations/ru.json
@@ -281,6 +281,11 @@
         "FIELD_HEADER_ENABLE_DRIVE"    : "Включить диск:",
         "FIELD_HEADER_ENABLE_PRINTING" : "Включить печать:",
         "FIELD_HEADER_ENABLE_SFTP"      : "Включить SFTP:",
+        "FIELD_HEADER_GATEWAY_DOMAIN"   : "Домен:",
+        "FIELD_HEADER_GATEWAY_HOSTNAME" : "Название сервера:",
+        "FIELD_HEADER_GATEWAY_PASSWORD" : "Пароль:",
+        "FIELD_HEADER_GATEWAY_PORT"     : "Порт:",
+        "FIELD_HEADER_GATEWAY_USERNAME" : "Имя пользователя:",
         "FIELD_HEADER_HEIGHT"          : "Высота:",
         "FIELD_HEADER_HOSTNAME"        : "Название сервера:",
         "FIELD_HEADER_IGNORE_CERT"     : "Игнорировать сертификат сервера:",