diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.xml b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.xml
index d31ab3ec2..45bc6a2da 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.xml
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.xml
@@ -12,6 +12,7 @@
     <param name="height"          type="numeric"  title="Display height"/>
     <param name="dpi"             type="numeric"  title="Display resolution (DPI)"/>
     <param name="color-depth"     type="enum" title="Color depth">
+        <option value=""></option>
         <option value="8">256 color</option>
         <option value="16">Low color (16-bit)</option>
         <option value="24">True color (24-bit)</option>
@@ -19,7 +20,7 @@
     </param>
 
     <param name="server-layout" type="enum" title="Keyboard layout">
-        <option value="">(default)</option>
+        <option value=""></option>
         <option value="en-us-qwerty">US English (Qwerty)</option>
         <option value="fr-fr-azerty">French (Azerty)</option>
         <option value="de-de-qwertz">German (Qwertz)</option>
@@ -35,7 +36,7 @@
     <param name="drive-path"      type="text"    title="Drive path"/>
 
     <param name="security" type="enum" title="Security mode">
-        <option value="">(default)</option>
+        <option value=""></option>
         <option value="rdp">RDP encryption</option>
         <option value="tls">TLS encryption</option>
         <option value="nla">NLA (Network Level Authentication)</option>
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.xml b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.xml
index b6ad57bbb..ed9faa56f 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.xml
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.xml
@@ -8,11 +8,13 @@
     <param name="swap-red-blue" type="boolean" title="Swap red/blue components" value="true"/>
 
     <param name="cursor" type="enum" title="Cursor">
+        <option value=""></option>
         <option value="local">Local</option>
         <option value="remote">Remote</option>
     </param>
 
     <param name="color-depth" type="enum" title="Color depth">
+        <option value=""></option>
         <option value="8">256 color</option>
         <option value="16">Low color (16-bit)</option>
         <option value="24">True color (24-bit)</option>
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index 1e178c69f..9055ecb36 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -263,15 +263,16 @@
         "FIELD_OPTION_COLOR_DEPTH_24"    : "True color (24-bit)",
         "FIELD_OPTION_COLOR_DEPTH_32"    : "True color (32-bit)",
         "FIELD_OPTION_COLOR_DEPTH_8"     : "256 color",
+        "FIELD_OPTION_COLOR_DEPTH_EMPTY" : "",
 
         "FIELD_OPTION_SECURITY_ANY"   : "Any",
-        "FIELD_OPTION_SECURITY_EMPTY" : "(default)",
+        "FIELD_OPTION_SECURITY_EMPTY" : "",
         "FIELD_OPTION_SECURITY_NLA"   : "NLA (Network Level Authentication)",
         "FIELD_OPTION_SECURITY_RDP"   : "RDP encryption",
         "FIELD_OPTION_SECURITY_TLS"   : "TLS encryption",
 
         "FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)",
-        "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "(default)",
+        "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "",
         "FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_FAILSAFE"     : "Unicode",
         "FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
@@ -357,11 +358,13 @@
         "FIELD_HEADER_READ_ONLY"        : "Read-only:",
         "FIELD_HEADER_SWAP_RED_BLUE"    : "Swap red/blue components:",
 
-        "FIELD_OPTION_COLOR_DEPTH_8"  : "256 color",
-        "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)",
-        "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)",
-        "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_8"     : "256 color",
+        "FIELD_OPTION_COLOR_DEPTH_16"    : "Low color (16-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_24"    : "True color (24-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_32"    : "True color (32-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_EMPTY" : "",
 
+        "FIELD_OPTION_CURSOR_EMPTY"  : "",
         "FIELD_OPTION_CURSOR_LOCAL"  : "Local",
         "FIELD_OPTION_CURSOR_REMOTE" : "Remote",