diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
index 9706ca2e5..8c1131bb8 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
@@ -62,7 +62,7 @@ public class LanguageRESTService {
     /**
      * The path to the translation folder within the webapp.
      */
-    private static final String TRANSLATION_PATHS = "/translations";
+    private static final String TRANSLATION_PATH = "/translations";
     
     /**
      * The JSON property for the human readable display name.
@@ -92,8 +92,8 @@ public class LanguageRESTService {
      *     The ServletContext associated with the request.
      *
      * @return
-     *     A list of languages defined in the system, consisting of 
-     *     language display name and key.
+     *     A map of languages defined in the system, of language key to 
+     *     display name.
      *
      * @throws GuacamoleException
      *     If an error occurs while retrieving the available languages.
@@ -104,7 +104,7 @@ public class LanguageRESTService {
             @Context ServletContext servletContext) throws GuacamoleException {
         
         // Get the paths of all the translation files
-        Set<String> resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATHS);
+        Set<String> resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATH);
         
         // If no translation files found, return an empty map
         if (resourcePaths == null)
@@ -113,7 +113,7 @@ public class LanguageRESTService {
         Map<String, String> languageMap = new HashMap<String, String>();
         
         // Iterate through all the found language files and add them to the return map
-        for(String resourcePath : resourcePaths) {
+        for (String resourcePath : resourcePaths) {
             
             // Get input stream for language file
             InputStream languageFileStream = servletContext.getResourceAsStream(resourcePath); 
diff --git a/guacamole/src/main/webapp/app/rest/services/languageService.js b/guacamole/src/main/webapp/app/rest/services/languageService.js
index 65c9d60d8..407a6a900 100644
--- a/guacamole/src/main/webapp/app/rest/services/languageService.js
+++ b/guacamole/src/main/webapp/app/rest/services/languageService.js
@@ -49,7 +49,7 @@ angular.module('rest').factory('languageService', ['$injector',
             token : authenticationService.getCurrentToken()
         };
 
-        // Retrieve available protocols
+        // Retrieve available languages
         return $http({
             cache   : cacheService.languages,
             method  : 'GET',
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
index 71a2ffe12..482529a37 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
@@ -200,6 +200,4 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
         }]
     };
     
-    
-    
 }]);
diff --git a/guacamole/src/main/webapp/app/settings/styles/update-password.css b/guacamole/src/main/webapp/app/settings/styles/preferences.css
similarity index 94%
rename from guacamole/src/main/webapp/app/settings/styles/update-password.css
rename to guacamole/src/main/webapp/app/settings/styles/preferences.css
index 3cf4d6332..eadf49020 100644
--- a/guacamole/src/main/webapp/app/settings/styles/update-password.css
+++ b/guacamole/src/main/webapp/app/settings/styles/preferences.css
@@ -20,7 +20,8 @@
  * THE SOFTWARE.
  */
 
-.preferences .update-password .form {
+.preferences .update-password .form, 
+.preferences .language .form {
     padding-left: 0.5em;
     border-left: 3px solid rgba(0, 0, 0, 0.125);
-}
+}
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
index 7ac8fe7d8..525fde30c 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
@@ -22,7 +22,7 @@
     -->
 
     <!-- Language settings -->
-    <div class="settings section language update-password">
+    <div class="settings section language">
         <p>{{'SETTINGS_PREFERENCES.HELP_LANGUAGE' | translate}}</p>
 
         <!-- Language selection -->