diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java
index 055d1a17d..2b501d702 100644
--- a/src/main/java/mekanism/client/ClientTickHandler.java
+++ b/src/main/java/mekanism/client/ClientTickHandler.java
@@ -220,7 +220,7 @@ public class ClientTickHandler
 					Mekanism.flamethrowerActive.remove(mc.thePlayer.getCommandSenderName());
 				}
 				
-				Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer)));
+				Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(mc.thePlayer.getCommandSenderName(), isFlamethrowerOn(mc.thePlayer)));
 			}
 
 			if(Mekanism.jetpackOn.contains(mc.thePlayer.getCommandSenderName()) != isJetpackOn(mc.thePlayer))
diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java
index 9e6816e08..8c7d13027 100644
--- a/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java
+++ b/src/main/java/mekanism/common/network/PacketFlamethrowerActive.java
@@ -18,15 +18,15 @@ public class PacketFlamethrowerActive implements IMessageHandler<FlamethrowerAct
 		
 		if(message.value)
 		{
-			Mekanism.flamethrowerActive.add(player.getCommandSenderName());
+			Mekanism.flamethrowerActive.add(message.username);
 		}
 		else {
-			Mekanism.flamethrowerActive.remove(player.getCommandSenderName());
+			Mekanism.flamethrowerActive.remove(message.username);
 		}
 		
 		if(!player.worldObj.isRemote)
 		{
-			Mekanism.packetHandler.sendToDimension(new FlamethrowerActiveMessage(message.value), player.worldObj.provider.dimensionId);
+			Mekanism.packetHandler.sendToDimension(new FlamethrowerActiveMessage(message.username, message.value), player.worldObj.provider.dimensionId);
 		}
 		
 		return null;
@@ -34,24 +34,28 @@ public class PacketFlamethrowerActive implements IMessageHandler<FlamethrowerAct
 	
 	public static class FlamethrowerActiveMessage implements IMessage
 	{
+		public String username;
 		public boolean value;
 		
 		public FlamethrowerActiveMessage() {}
 	
-		public FlamethrowerActiveMessage(boolean state)
+		public FlamethrowerActiveMessage(String name, boolean state)
 		{
+			username = name;
 			value = state;
 		}
 	
 		@Override
 		public void toBytes(ByteBuf dataStream)
 		{
+			PacketHandler.writeString(dataStream, username);
 			dataStream.writeBoolean(value);
 		}
 	
 		@Override
 		public void fromBytes(ByteBuf dataStream)
 		{
+			username = PacketHandler.readString(dataStream);
 			value = dataStream.readBoolean();
 		}
 	}