diff --git a/plexpy/logger.py b/plexpy/logger.py
index bda5c4cc..5a1c0f0f 100644
--- a/plexpy/logger.py
+++ b/plexpy/logger.py
@@ -126,7 +126,11 @@ class UsernameFilter(logging.Filter):
         if not plexpy._INITIALIZED:
             return True
 
-        items = users.Users().get_users() or []
+        items = sorted(
+            users.Users().get_users(),
+            key=lambda x: len(x['username']),
+            reverse=True
+        )
 
         for item in items:
             username = item['username']
@@ -339,11 +343,11 @@ def initLogger(console=False, log_dir=False, verbose=False):
                        logger_plex_websocket.handlers + \
                        cherrypy.log.error_log.handlers
         for handler in log_handlers:
-            handler.addFilter(UsernameFilter())
             handler.addFilter(BlacklistFilter())
             handler.addFilter(PublicIPFilter())
             handler.addFilter(PlexDirectIPFilter())
             handler.addFilter(EmailFilter())
+            handler.addFilter(UsernameFilter())
             handler.addFilter(PlexTokenFilter())
 
     # Install exception hooks
diff --git a/plexpy/users.py b/plexpy/users.py
index dbb064bf..571b565f 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -668,7 +668,7 @@ class Users(object):
             result = monitor_db.select(query=query)
         except Exception as e:
             logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e)
-            return None
+            return []
 
         users = []
         for item in result: