diff --git a/guacamole/src/main/webapp/scripts/admin-ui.js b/guacamole/src/main/webapp/scripts/admin-ui.js
index 5c1dbe663..62d4feeab 100644
--- a/guacamole/src/main/webapp/scripts/admin-ui.js
+++ b/guacamole/src/main/webapp/scripts/admin-ui.js
@@ -672,12 +672,17 @@ GuacAdmin.ConnectionEditor = function(connection, parameters) {
 
     // Header parameter containers
     var name_container     = GuacUI.createTabulatedContainer(header_table, "Name:");
+    var location_container = GuacUI.createTabulatedContainer(header_table, "Location:");
     var protocol_container = GuacUI.createTabulatedContainer(header_table, "Protocol:");
 
     var name_field     = GuacUI.createChildElement(name_container, "input");
+    var location       = GuacUI.createChildElement(location_container, "div", "location");
     var protocol_field = GuacUI.createChildElement(protocol_container, "select");
     name_field.setAttribute("type", "text");
 
+    // FIXME: STUB: Location field
+    location.textContent = connection.parent.name;
+
     // Set header
     if (connection) {
         name_field.value =
@@ -981,13 +986,18 @@ GuacAdmin.ConnectionGroupEditor = function(group, parameters) {
         "table", "fields section");
 
     // Header parameter containers
-    var name_container = GuacUI.createTabulatedContainer(header_table, "Name:");
-    var type_container = GuacUI.createTabulatedContainer(header_table, "Type:");
+    var name_container     = GuacUI.createTabulatedContainer(header_table, "Name:");
+    var location_container = GuacUI.createTabulatedContainer(header_table, "Location:");
+    var type_container     = GuacUI.createTabulatedContainer(header_table, "Type:");
 
     var name_field = GuacUI.createChildElement(name_container, "input");
+    var location   = GuacUI.createChildElement(location_container, "div", "location");
     var type_field = GuacUI.createChildElement(type_container, "select");
     name_field.setAttribute("type", "text");
 
+    // FIXME: STUB: Location field
+    location.textContent = group.parent.name;
+
     // Set title
     if (group) {
         name_field.value =
diff --git a/guacamole/src/main/webapp/styles/ui.css b/guacamole/src/main/webapp/styles/ui.css
index 60c181b5c..e91fb1f08 100644
--- a/guacamole/src/main/webapp/styles/ui.css
+++ b/guacamole/src/main/webapp/styles/ui.css
@@ -31,7 +31,7 @@ input[type=submit], button {
     -webkit-appearance: none;
 }
 
-input[type=text], input[type=number], input[type=password] {
+div.location, input[type=text], input[type=number], input[type=password] {
     border: 1px solid #777;
     -moz-border-radius: 0.2em;
     -webkit-border-radius: 0.2em;
@@ -39,6 +39,9 @@ input[type=text], input[type=number], input[type=password] {
     border-radius: 0.2em;
     width: 100%;
     padding: 0.25em;
+    font-size: 10pt;
+    background: white;
+    cursor: text;
 }
 
 button {
@@ -331,10 +334,6 @@ div.section {
 
 }
 
-.form input {
-    width: auto;
-}
-
 /*
  * List element icons
  */