diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 68c9a30e4..0ca3b0d60 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -174,7 +174,7 @@ UI.initConference = function () {
     }
 
     // Make sure we configure our avatar id, before creating avatar for us
-    UI.setUserAvatar(id, settings.email || settings.uid);
+    UI.setUserAvatar(id, settings.email);
 
     Toolbar.checkAutoEnableDesktopSharing();
 };
@@ -382,7 +382,7 @@ UI.addUser = function (id, displayName) {
         UIUtil.playSoundNotification('userJoined');
 
     // Configure avatar
-    UI.setUserAvatar(id, displayName);
+    UI.setUserAvatar(id);
 
     // Add Peer's container
     VideoLayout.addParticipantContainer(id);