Index: standard/src/main/webapp/templates/getgroupmembers.vm
===================================================================
--- standard/src/main/webapp/templates/getgroupmembers.vm	(revision 29916)
+++ standard/src/main/webapp/templates/getgroupmembers.vm	(working copy)
@@ -31,6 +31,19 @@
     #set($mdoc = $xwiki.getDocument($m))
     #set($wikiname = $mdoc.getWiki())
     #if($wikiname != 'xwiki' || $wikiname == $context.database) #set($wikiname = 'local') #end
+    #set($mDoc = $xwiki.getDocument($m))
+    #set($userObj = $mDoc.getObject("XWiki.XWikiUsers"))
+    #set($groupObj = $mDoc.getObject("XWiki.XWikiGroups"))
+    #set($emptyValue = $msg.get('xe.admin.groups.emptyvalue'))
+    #set($noAvatarImg = $xwiki.getSkinFile('noavatar.png'))
+    #set($mAvatarImg = $!userObj.getProperty('avatar').value)
+    #set($mGroupImg = $xwiki.getSkinFile('noavatargroup.png'))
+    #set($mAvatarSrc = $noAvatarImg)
+	#if($!userObj && "$!mAvatarImg" != "")
+      #set($mAvatarSrc = $mDoc.getAttachmentURL($mAvatarImg))
+    #elseif($!groupObj)
+      #set($mAvatarSrc = $mGroupImg)
+    #end
     #if( $velocityCount > 1 ) , #end
    {
     "fullname"     : "$m",
@@ -44,7 +57,11 @@
     "doc_hasadmin" : "${xwiki.hasAccessLevel('admin', $context.user, $doc)}",
     "member"   : "$xwiki.getUserName($m, false)#if($hasAdmin || $isAdvancedUser) (#if($wikiname != 'local')$wikiname:#end$m)#end",
     "member_url" : "$xwiki.getURL($m)",
-    "doc_delete_url" : "$doc.getURL('view', "xpage=deletegroupmember&fullname=${m}&ajax=true")"
+    "doc_delete_url" : "$doc.getURL('view', "xpage=deletegroupmember&fullname=${m}&ajax=true")",
+    "_avatar" : "<img src='$!mAvatarSrc' width='50' alt='$m' title='$m' />",
+    "email" : #if($userObj && "$!userObj.getProperty('email').value" != "") "$!userObj.getProperty('email').value" #else "$emptyValue" #end,
+    "company" : #if($userObj && "$!userObj.getProperty('company').value" != "") "$!userObj.getProperty('company').value" #else "$emptyValue" #end,
+    "phone" : #if($userObj && "$!userObj.getProperty('phone').value" != "") "$!userObj.getProperty('phone').value" #else "$emptyValue" #end
    }
 #end
 ]}