diff --git a/otp/avatar/LocalAvatar.py b/otp/avatar/LocalAvatar.py
index 819e0cc3..6b4d393d 100755
--- a/otp/avatar/LocalAvatar.py
+++ b/otp/avatar/LocalAvatar.py
@@ -1098,18 +1098,18 @@ class LocalAvatar(DistributedAvatar.DistributedAvatar, DistributedSmoothNode.Dis
 
     def __friendOnline(self, doId):
         friend = base.cr.identifyFriend(doId)
-        if friend:
+        if friend != None:
             self.setSystemMessage(doId, OTPLocalizer.WhisperFriendComingOnline % friend.getName())
 
     def __friendOffline(self, doId):
         friend = base.cr.identifyFriend(doId)
-        if friend:
+        if friend != None:
             self.setSystemMessage(0, OTPLocalizer.WhisperFriendLoggedOut % friend.getName())
 
     def clickedWhisper(self, doId):
         friend = base.cr.identifyFriend(doId)
 
-        if friend:
+        if friend != None:
             messenger.send('clickedNametag', [friend])
             self.chatMgr.whisperTo(friend.getName(), doId)
 
diff --git a/toontown/friends/TTSFriendsManagerUD.py b/toontown/friends/TTSFriendsManagerUD.py
index 1133cc90..bd78350c 100755
--- a/toontown/friends/TTSFriendsManagerUD.py
+++ b/toontown/friends/TTSFriendsManagerUD.py
@@ -239,6 +239,7 @@ class TTSFriendsManagerUD(DistributedObjectGlobalUD):
             friendId = friend[0]
             if friendId in self.onlineToons:
                 self.sendUpdateToAvatarId(doId, 'friendOnline', [friendId])
+            self.sendUpdateToAvatarId(friendId, 'friendOnline', [doId])
 
     def goingOffline(self, avId):
         self.toonOffline(avId)