diff --git a/Changes b/Changes
index 7a6a97b3a..a8d5b7bbc 100644
--- a/Changes
+++ b/Changes
@@ -1318,3 +1318,5 @@
   add the same token twice. Didn't cause any trouble, normally, though...
 - Updated ukrainian-w1251 and belarussian-w1251 charsets: some characters were previously
   included that shouldn't. Reported by avb (#0003102), patch supplied by Bock.
+- Made it so that when 'java' is enabled for a listen block, then the 2nd parameter to
+  NICK is not seen as a password on this port. Patch from afolentes (#0003097).
diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index 8f35573f0..6a2ff4c9d 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -706,7 +706,8 @@ DLLFUNC CMD_FUNC(m_nick)
 		/* Copy password to the passwd field if it's given after NICK
 		 * - originally by taz, modified by Wizzu
 		 */
-		if ((parc > 2) && (strlen(parv[2]) <= PASSWDLEN))
+		if ((parc > 2) && (strlen(parv[2]) <= PASSWDLEN)
+		    && !(sptr->listener->umodes & LISTENER_JAVACLIENT))
 		{
 			if (sptr->passwd)
 				MyFree(sptr->passwd);