diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
index 2281930e0..dd7ba2774 100644
--- a/guacamole-common-js/src/main/webapp/modules/Client.js
+++ b/guacamole-common-js/src/main/webapp/modules/Client.js
@@ -1856,7 +1856,7 @@ Guacamole.Client.Message = {
     
     /**
      * A client message that indicates that a user has joined an existing
-     * connection. This message xpects a single additional argument - the
+     * connection. This message expects a single additional argument - the
      * username of the user who has joined the connection.
      * 
      * @type {!number}
diff --git a/guacamole/src/main/frontend/src/app/client/directives/guacClientMessage.js b/guacamole/src/main/frontend/src/app/client/directives/guacClientMessage.js
index bf937d20a..840ca40df 100644
--- a/guacamole/src/main/frontend/src/app/client/directives/guacClientMessage.js
+++ b/guacamole/src/main/frontend/src/app/client/directives/guacClientMessage.js
@@ -41,6 +41,7 @@ angular.module('client').directive('guacClientMessage', [function guacClientMess
         controller: ['$scope', '$injector', '$element',
                 function guacClientMessageController($scope, $injector, $element) {
             
+            // Required types
             const ManagedClientMessage = $injector.get('ManagedClientMessage');
             
             /**
@@ -61,7 +62,9 @@ angular.module('client').directive('guacClientMessage', [function guacClientMess
             /**
              * Returns a set of key/value object pairs that represent the
              * arguments provided as part of the message in the form
-             * ARGS[0] = value.
+             * ARGS[0] = value. Guacamole's translation system relies on
+             * the arguments being available in this format in order to be able
+             * to handle substituting values for an arbitrary list of arguments.
              * 
              * @returns {Object}
              */