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 934e67a7d..c59be1633 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
@@ -38,7 +38,7 @@
                 {
                     "name"    : "security",
                     "type"    : "ENUM",
-                    "options" : [ "", "rdp", "tls", "nla", "vmconnect", "any" ]
+                    "options" : [ "", "any", "nla", "rdp", "tls", "vmconnect" ]
                 },
                 {
                     "name"    : "disable-auth",
@@ -111,12 +111,11 @@
                         "en-us-qwerty",
                         "es-es-qwerty",
                         "es-latam-qwerty",
-                        "failsafe",
                         "fr-be-azerty",
                         "fr-fr-azerty",
                         "fr-ca-qwerty",
                         "fr-ch-qwertz",
-                        "hu-hu-qwertz",                        
+                        "hu-hu-qwertz",
                         "it-it-qwerty",
                         "ja-jp-qwerty",
                         "no-no-qwerty",
@@ -126,7 +125,8 @@
                         "ro-ro-qwerty",
                         "sv-se-qwerty",
                         "da-dk-qwerty",
-                        "tr-tr-qwerty"
+                        "tr-tr-qwerty",
+                        "failsafe"
                     ]
                 },
                 {
@@ -174,7 +174,7 @@
                 {
                     "name"    : "resize-method",
                     "type"    : "ENUM",
-                    "options" : [ "", "reconnect", "display-update" ]
+                    "options" : [ "", "display-update", "reconnect" ]
                 },
                 {
                     "name"    : "read-only",
diff --git a/guacamole/src/main/frontend/src/app/form/templates/selectField.html b/guacamole/src/main/frontend/src/app/form/templates/selectField.html
index 635527557..d5d66cda1 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/selectField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/selectField.html
@@ -4,5 +4,5 @@
             ng-disabled="disabled"
             guac-focus="focused"
             ng-model="model"
-            ng-options="option as getFieldOption(option) | translate for option in field.options | orderBy: value"></select>
+            ng-options="option as getFieldOption(option) | translate for option in field.options"></select>
 </div>