diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py
index 89c0ca97..38d7b6fa 100755
--- a/toontown/toon/Toon.py
+++ b/toontown/toon/Toon.py
@@ -830,7 +830,7 @@ class Toon(Avatar.Avatar, ToonHead):
             self.loadAnims(HeadAnimDict[self.style.head], 'head', '500')
             self.loadAnims(HeadAnimDict[self.style.head], 'head', '250')
 
-    def swapToonHead(self, headStyle=-1, laughingMan=-1, copy = 1):
+    def swapToonHead(self, headStyle=-1, laughingMan=0, copy = 1):
         self.stopLookAroundNow()
         self.eyelids.request('open')
         self.unparentToonParts()
@@ -842,7 +842,6 @@ class Toon(Avatar.Avatar, ToonHead):
             del self._Actor__commonBundleHandles['head']
         if headStyle > -1:
             self.style.head = headStyle
-        laughingMan = laughingMan or self.style.laughingMan or self.getWantLaughingManHoliday()
         self.generateToonHead(copy)
         self.generateToonColor()
         self.parentToonParts()
@@ -850,7 +849,7 @@ class Toon(Avatar.Avatar, ToonHead):
         self.resetHeight()
         self.eyelids.request('open')
         self.startLookAround()
-        if laughingMan:
+        if laughingMan or self.getWantLaughingMan():
             LaughingManGlobals.addToonEffect(self)
 
     def generateToonColor(self):
@@ -985,8 +984,8 @@ class Toon(Avatar.Avatar, ToonHead):
 
         return swappedTorso
 
-    def generateLaughingMan(self, force=False):
-        if force or self.getWantLaughingMan():
+    def generateLaughingMan(self):
+        if self.getWantLaughingMan():
             self.swapToonHead(laughingMan=True)
     
     def generateHat(self, fromRTM = False):
diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py
index 7aa66354..b7fb6029 100755
--- a/toontown/toon/ToonDNA.py
+++ b/toontown/toon/ToonDNA.py
@@ -2648,7 +2648,7 @@ class ToonDNA:
         self.botTexColor = bottomTextureColor
         self.laughingMan = laughingMan
 
-    def updateToonProperties(self, head = None, torso = None, legs = None, gender = None, armColor = None, gloveColor = None, legColor = None, headColor = None, topTexture = None, topTextureColor = None, sleeveTexture = None, sleeveTextureColor = None, bottomTexture = None, bottomTextureColor = None, shirt = None, bottom = None, laughingMan = None):
+    def updateToonProperties(self, head = None, torso = None, legs = None, gender = None, armColor = None, gloveColor = None, legColor = None, headColor = None, topTexture = None, topTextureColor = None, sleeveTexture = None, sleeveTextureColor = None, bottomTexture = None, bottomTextureColor = None, shirt = None, bottom = None, laughingMan = False):
         if head:
             self.head = head
         if torso:
@@ -2677,8 +2677,7 @@ class ToonDNA:
             self.botTex = bottomTexture
         if bottomTextureColor:
             self.botTexColor = bottomTextureColor
-        if laughingMan:
-            self.laughingMan = laughingMan
+        self.laughingMan = laughingMan
         if shirt:
             str, colorIndex = shirt
             defn = ShirtStyles[str]
diff --git a/toontown/toon/ToonHead.py b/toontown/toon/ToonHead.py
index aacec3ab..85b73c14 100755
--- a/toontown/toon/ToonHead.py
+++ b/toontown/toon/ToonHead.py
@@ -197,7 +197,7 @@ class ToonHead(Actor.Actor):
         if dna.getAnimal() == 'dog':
             self.loop('neutral')
         if dna.laughingMan:
-            LaughingManGlobals.addHeadEffect(self.getGeomNode(), book=True)
+            LaughingManGlobals.addHeadEffect(self.getGeomNode(), book=forGui)
 
     def fitAndCenterHead(self, maxDim, forGui = 0):
         p1 = Point3()