diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 7ad0d639c..43e2ac02d 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -73,10 +73,12 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Theme_Style {
 			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
 			if($hasemail)
 				echo "</a>";
-			echo "<br />";
+			if($currUser->getComment())
+				echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 			if($hasemail)
-				echo "<small>".htmlspecialchars($currUser->getEmail())."</small><br />";
-			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
+				echo "<br /><small><i class=\"fa fa-envelope-o\"></i> <a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a></small>";
+			if($homefolder = $currUser->getHomeFolder())
+				echo "<br /><small><i class=\"fa fa-folder-o\"></i> <a href=\"../out/out.ViewFolder.php?folderid=".$homefolder."\">".htmlspecialchars($dms->getFolder($homefolder)->getName())."</a></small>";
 			echo "</td>";
 			echo "<td>";
 			echo getMLText('role').": ";