diff --git a/src/plugins/plugin_misc_identity.py b/src/plugins/plugin_misc_identity.py
index a0d31394..643d11bc 100755
--- a/src/plugins/plugin_misc_identity.py
+++ b/src/plugins/plugin_misc_identity.py
@@ -83,7 +83,10 @@ class Identity(object):
         except exceptions.NotFound:
             pass
         else:
-            id_data[u'avatar_basename'] = os.path.basename(avatar_path)
+            if avatar_path:
+                id_data[u'avatar_basename'] = os.path.basename(avatar_path)
+            else:
+                del id_data[u'avatar']
 
         defer.returnValue(id_data)