diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index de453c0a..67c9138d 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -1920,6 +1920,14 @@ def dbcheck():
             'ALTER TABLE users ADD COLUMN title TEXT'
         )
 
+    try:
+        result = c_db.execute('SELECT * FROM users WHERE friendly_name = username').fetchall()
+        if result:
+            logger.debug("Altering database. Resetting user friendly names equal to username.")
+            c_db.execute('UPDATE users SET friendly_name = NULL WHERE friendly_name = username')
+    except sqlite3.OperationalError:
+       pass
+
     # Upgrade notify_log table from earlier versions
     try:
         c_db.execute('SELECT poster_url FROM notify_log')
diff --git a/plexpy/users.py b/plexpy/users.py
index 33ff543c..2c988050 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -361,6 +361,10 @@ class Users(object):
         if str(user_id).isdigit():
             monitor_db = database.MonitorDatabase()
 
+            user = monitor_db.select_single('SELECT username FROM users WHERE user_id = ?', [user_id])
+            if user.get('username') == friendly_name:
+                friendly_name = None
+
             key_dict = {'user_id': user_id}
             value_dict = {'friendly_name': friendly_name,
                           'custom_avatar_url': custom_thumb,