diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index adda3782..3d6ab932 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -164,7 +164,7 @@
                                 <input type="checkbox" id="log_blacklist_usernames" name="log_blacklist_usernames" value="1" ${config['log_blacklist_usernames']}> Mask Usernames in Logs
                             </label>
                             <p class="help-block">
-                                Enable to mask Plex usernames and Tautulli friendly names with asterisks (*) in the logs.<br />
+                                Enable to mask Plex usernames with asterisks (*) in the logs.<br />
                                 Note: Only logs from the time this setting is enabled will be masked.
                             </p>
                         </div>
diff --git a/plexpy/logger.py b/plexpy/logger.py
index cf7fb294..bda5c4cc 100644
--- a/plexpy/logger.py
+++ b/plexpy/logger.py
@@ -130,20 +130,17 @@ class UsernameFilter(logging.Filter):
 
         for item in items:
             username = item['username']
-            friendly_name = item['friendly_name']
 
-            if username == 'Local':
+            if username.lower() in ('local', 'guest'):
                 continue
 
             try:
                 record.msg = self.replace(record.msg, username)
-                record.msg = self.replace(record.msg, friendly_name)
 
                 args = []
                 for arg in record.args:
                     if isinstance(arg, str):
                         arg = self.replace(arg, username)
-                        arg = self.replace(arg, friendly_name)
                     args.append(arg)
                 record.args = tuple(args)
             except:
@@ -154,7 +151,7 @@ class UsernameFilter(logging.Filter):
     @staticmethod
     def replace(text, match):
         mask = match[:2] + 8 * '*' + match[-1]
-        return re.sub(r'\b{}\b'.format(match), mask, text, flags=re.IGNORECASE)
+        return re.sub(re.escape(match), mask, text, flags=re.IGNORECASE)
 
 
 class RegexFilter(logging.Filter):