diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index daf42544..2863dfb3 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -69,6 +69,12 @@ try{
 							//$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');
 							$x['avatar_url'] = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==';
 						} else {
+						// https://github.com/owncloud/documents/issues/51
+						// Temporary stub
+						
+							$x['avatar_url'] = $x['uid'];
+							
+							/*
 							$avatar = new \OC_Avatar($x['uid']);
 							$image = $avatar->get(64);
 							// User has an avatar 
@@ -81,7 +87,11 @@ try{
 								//shortcircuit if it's not an image
 								$x['avatar_url'] = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==';
 							}
+							 
+							 */
 						}
+						
+
 						return $x;
 					}, 
 					$members
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
index cbab8ec9..a6381aae 100644
--- a/js/3rdparty/webodf/editor/MemberListView.js
+++ b/js/3rdparty/webodf/editor/MemberListView.js
@@ -73,6 +73,10 @@ define("webodf/editor/MemberListView",
                             node.src = memberDetails.imageurl;
                             // update border color
                             node.style.borderColor = memberDetails.color;
+						} else if (node.localName === "span"){
+							node.style.display='block';
+							$(node).avatar(memberDetails.imageurl, 64);
+							node.style.borderColor = memberDetails.color;
                         } else if (node.localName === "div") {
                             node.setAttribute('fullname', memberDetails.fullname);
                         }
@@ -92,7 +96,7 @@ define("webodf/editor/MemberListView",
             var doc = memberListDiv.ownerDocument,
                 htmlns = doc.documentElement.namespaceURI,
                 avatarDiv = doc.createElementNS(htmlns, "div"),
-                imageElement = doc.createElement("img"),
+                imageElement = doc.createElement("span"),
                 fullnameNode = doc.createElement("div");
 
             avatarDiv.className = "memberListButton";