diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
index a94c7df46..f725bdfce 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProvider.java
@@ -55,7 +55,7 @@ public class QuickConnectAuthenticationProvider extends SimpleAuthenticationProv
      * @param credentials
      *     Credentials object passed in from Guacamole login.
      *
-     * @returns
+     * @return
      *     Returns null, which causes the client to move on to the next
      *     module.
      */
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectConnectionGroup.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectConnectionGroup.java
index 5abf0bee3..4faab1cc6 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectConnectionGroup.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectConnectionGroup.java
@@ -48,6 +48,7 @@ class QuickConnectConnectionGroup extends AbstractConnectionGroup {
      *
      * @param name
      *     The name of the QuickConnectConnectionGroup.
+     *
      * @param identifier
      *     The identifier of the QuickConnectConnectionGroup.
      */
@@ -67,6 +68,7 @@ class QuickConnectConnectionGroup extends AbstractConnectionGroup {
      *
      * @param identifier
      *     The identifier of the connection to add to the group.
+     *
      * @return
      *     The String identifier of the connection if the add
      *     operation was successful; otherwise null.
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java
index 5c9606d31..ce1fd1f1d 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectDirectory.java
@@ -66,7 +66,7 @@ public class QuickConnectDirectory extends SimpleConnectionDirectory {
     /**
      * Returns the current counter and then increments it.
      *
-     * @returns
+     * @return
      *     An Integer representing the next available connection
      *     ID to get used when adding connections.
      */
@@ -89,7 +89,7 @@ public class QuickConnectDirectory extends SimpleConnectionDirectory {
      * @param object
      *     The QuickConnection object to add to the tree.
      *
-     * @returns
+     * @return
      *     The connectionId of the object added to the directory.
      *
      * @throws GuacamoleException
@@ -123,7 +123,7 @@ public class QuickConnectDirectory extends SimpleConnectionDirectory {
      *     The GuacamoleConfiguration to use to create the
      *     QuickConnection object.
      *
-     * @returns
+     * @return
      *     The connectionId of the object creation in the directory.
      *
      * @throws GuacamoleException
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
index b1a2752ca..d9eb3895b 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
@@ -94,6 +94,7 @@ public class QuickConnectUserContext implements UserContext {
      * @param authProvider
      *     The authentication provider module instantiating this
      *     this class.
+     *
      * @param username
      *     The name of the user logging in and using this class.
      */
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnection.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnection.java
index 1735757fe..a2f381447 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnection.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnection.java
@@ -68,9 +68,11 @@ public class QuickConnection extends AbstractConnection {
      *
      * @param name
      *     The name of the connection.
+     *
      * @param identifier
      *     The unique identifier of this connection within this
      *     authentication module.
+     *
      * @param config
      *     The GuacamoleConfiguration object to store in this
      *     QuickConnection.
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
index d494eb883..42e53a2f8 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
@@ -80,12 +80,11 @@ public class QuickConnectREST {
      * @param uri
      *     The URI to parse into a connection.
      *
-     * @returns
+     * @return
      *     The ID of the connection in the directory.
      *
-     * @throws
-     *     Throws a GuacamoleException if an error is encountered
-     *     parsing the URI.
+     * @throws GuacamoleException
+     *     If an error is encountered parsing the URI.
      */
     @POST
     @Path("create")
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
index 4ada3f089..05b892fcc 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
@@ -51,7 +51,7 @@ public class QCParser {
      * @param uri
      *     The string form of the URI to be parsed.
      *
-     * @returns
+     * @return
      *     A GuacamoleConfiguration using a combination of the parsed
      *     URI values and default values when not specified in the
      *     URI.