diff --git a/common/cl_input.c b/common/cl_input.c
index 5939b6e..49cdf11 100644
--- a/common/cl_input.c
+++ b/common/cl_input.c
@@ -609,6 +609,12 @@ CL_SendMove ( usercmd_t *cmd )
 		bits |= 2;
 	in_jump.state &= ~2;
 
+// 1999-10-29 +USE fix by Maddes  start
+	if (in_use.state & 3)
+		bits |= 4;
+	in_use.state &= ~2;
+// 1999-10-29 +USE fix by Maddes  end
+
 	MSG_WriteByte (&buf, bits);
 
 	MSG_WriteByte (&buf, in_impulse);
diff --git a/common/qargs.c b/common/qargs.c
index ad11d54..203e3c9 100644
--- a/common/qargs.c
+++ b/common/qargs.c
@@ -58,6 +58,8 @@ char	**com_argv;
 char	*com_cmdline;
 cvar_t	*cmdline;
 
+qboolean	nouse = false;	// 1999-10-29 +USE fix by Maddes
+
 /*
 ================
 COM_CheckParm
@@ -143,6 +145,13 @@ COM_InitArgv ( int argc, char **argv )
 		hipnotic = true;
 		standard_quake = false;
 	}
+
+// 1999-10-29 +USE fix by Maddes  start
+	if (COM_CheckParm ("-nouse"))
+	{
+		nouse = true;
+	}
+// 1999-10-29 +USE fix by Maddes  end
 }
 
 /*
diff --git a/uquake/sv_user.c b/uquake/sv_user.c
index b1a0725..982b060 100644
--- a/uquake/sv_user.c
+++ b/uquake/sv_user.c
@@ -462,6 +462,8 @@ SV_ClientThink ( void )
 SV_ReadClientMove
 ===================
 */
+extern qboolean		nouse;	// 1999-10-29 +USE fix by Maddes
+
 void
 SV_ReadClientMove ( usercmd_t *move )
 {
@@ -488,6 +490,12 @@ SV_ReadClientMove ( usercmd_t *move )
 // read buttons
 	bits = MSG_ReadByte ();
 	host_client->edict->v.button0 = bits & 1;
+// 1999-10-29 +USE fix by Maddes  start
+	if (!nouse)
+	{
+		host_client->edict->v.button1 = (bits & 4)>>2;
+	}
+// 1999-10-29 +USE fix by Maddes  end
 	host_client->edict->v.button2 = (bits & 2)>>1;
 
 	i = MSG_ReadByte ();