diff --git a/src/main/java/org/olat/modules/fo/_content/threadview.html b/src/main/java/org/olat/modules/fo/_content/threadview.html
index 013f729a5b238abdacd8e5d36b0f601498e85c82..11b3dc86c25caa9a41674da559b6de6dbecc4340 100644
--- a/src/main/java/org/olat/modules/fo/_content/threadview.html
+++ b/src/main/java/org/olat/modules/fo/_content/threadview.html
@@ -148,7 +148,7 @@
 							 $r.formatBytes($attachment.getSize())
 						</div>
 						#if ($attachment.getMetaInfo() && $attachment.getMetaInfo().isThumbnailAvailable())										
-						<img src="${thumbMapper}/$message.get("id")/$attachment.getMetaInfo().getUUID()/$fname" class="img-thumbnail" title="$r.escapeHtml("$fname")" class=""/>
+						<img src="${thumbMapper}/$message.get("id")/$attachment.getMetaInfo().getUUID()/$fname" class="img-thumbnail" alt="$r.escapeHtml("$fname")" title="$r.escapeHtml("$fname")"/>
 						<i class="o_icon o_icon-lg o_icon_enlarge"></i>
 						#end
 					</a>		
diff --git a/src/main/java/org/olat/user/DisplayPortraitController.java b/src/main/java/org/olat/user/DisplayPortraitController.java
index b8e3f31415f0734880db208fafc8d197791fdca7..f99e480cf65018d3337b6554e4b3833f8e423197 100644
--- a/src/main/java/org/olat/user/DisplayPortraitController.java
+++ b/src/main/java/org/olat/user/DisplayPortraitController.java
@@ -27,6 +27,7 @@ package org.olat.user;
 
 import java.io.File;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
@@ -40,7 +41,6 @@ import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
 import org.olat.core.id.Identity;
 import org.olat.core.id.UserConstants;
 import org.olat.core.logging.AssertException;
-import org.olat.core.util.StringHelper;
 import org.olat.user.propertyhandlers.GenderPropertyHandler;
 
 /**
@@ -147,9 +147,10 @@ public class DisplayPortraitController extends BasicController {
 		myContent.contextPut("hasPortrait", (portrait != null) ? Boolean.TRUE : Boolean.FALSE);
 		myContent.contextPut("identityKey", portraitIdent.getKey().toString());
 		myContent.contextPut("displayUserFullName", displayUserFullName);
-		myContent.contextPut("firstname", StringHelper.escapeHtml(portraitIdent.getUser().getProperty(UserConstants.FIRSTNAME, null)));
-		myContent.contextPut("lastname",StringHelper.escapeHtml(portraitIdent.getUser().getProperty(UserConstants.LASTNAME, null)));
-		
+		String fullName = UserManager.getInstance().getUserDisplayName(portraitIdent);
+		myContent.contextPut("fullName", fullName);		
+		String altText = translate("title.homepage") + ": " + fullName;
+		myContent.contextPut("altText", StringEscapeUtils.escapeHtml(altText));
 		
 		putInitialPanel(myContent);
 	}
diff --git a/src/main/java/org/olat/user/_content/displayportrait.html b/src/main/java/org/olat/user/_content/displayportrait.html
index 89bfd3c4aac095dff6aa3e8949d31ec9d3e4efbb..b64cf34e2649dee116c58bb557d34e969365f0ee 100644
--- a/src/main/java/org/olat/user/_content/displayportrait.html
+++ b/src/main/java/org/olat/user/_content/displayportrait.html
@@ -3,18 +3,18 @@
 #if ($hasPortrait)
 	#if ($canLinkToHomePage)
 		<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
-			<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
+			<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
 		</a>
 	#else
-		<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
+		<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
 	#end
 #else
 	#if ($canLinkToHomePage)
 		<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
-		    <img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass"/>
+		    <img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/>
 		</a>
 	#else
-		<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass"/>
+		<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/>
 	#end
 #end
 	</div>
@@ -22,10 +22,10 @@
 	<div class="o_portrait_name">
 	#if ($canLinkToHomePage)
 		<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
-			$firstname $lastname
+			$fullName
 		</a>
 	#else
-		$firstname $lastname
+		$fullName
 	#end
 	</div>
 #end