Index: messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java
===================================================================
--- messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java       (revision 63457)
+++ messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java       (working copy)
@@ -40,6 +40,7 @@
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.SecurityService;
+import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.site.api.Group;
 import org.sakaiproject.site.api.Site;
@@ -263,7 +264,14 @@
       {
        MembershipItem memberItem = MembershipItem.getInstance();
        memberItem.setType(MembershipItem.TYPE_USER);
+           if (ServerConfigurationService.getBoolean("msg.displayEid", true))
+        {
        memberItem.setName(user.getSortName() + " (" + user.getDisplayId() + ")");
+        }
+        else
+        {
+         memberItem.setName(user.getSortName());
+        }
        memberItem.setUser(user);
        memberItem.setRole(userRole);

Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java     (revision 63457)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java     (working copy)
@@ -873,8 +873,15 @@
     try
     {
       User user=UserDirectoryService.getUser(id) ;
+      if (ServerConfigurationService.getBoolean("msg.displayEid", true))
+      {
       userName= user.getSortName() + " (" + user.getDisplayId() + ")";
     }
+      else
+      {
+        userName= user.getSortName();
+      }
+    }
     catch (UserNotDefinedException e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
@@ -887,8 +894,14 @@
    try
    {
      User user=UserDirectoryService.getUser(userId) ;
+     if (ServerConfigurationService.getBoolean("msg.displayEid", true))
+     {
      userName= user.getDisplayName() + " (" + user.getDisplayId() + ")";
    }
+     else {
+       userName= user.getDisplayName();
+     }
+   }
    catch (UserNotDefinedException e) {
        // TODO Auto-generated catch block
        e.printStackTrace();
@@ -4194,7 +4207,14 @@
        try
        {
         User user = UserDirectoryService.getUser(getUserId());
+         if (ServerConfigurationService.getBoolean("msg.displayEid", true))
+         {
          authorString = user.getSortName() + " (" + user.getDisplayId() + ")";
+         }
+         else
+         {
+           authorString = user.getSortName();
+         }

        }
        catch(Exception e)
@@ -4424,4 +4444,4 @@
        public void setContentHostingService(ContentHostingService contentHostingService) {
                this.contentHostingService = contentHostingService;
        }
Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java     (revision 63457)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java     (working copy)
@@ -6072,11 +6072,15 @@
                  String userEidString = "";
                  userEidString = UserDirectoryService.getUser(currentUserId).getDisplayId();

-                 if((userString != null && userString.length() > 0))
+                 if((userString != null && userString.length() > 0) && ServerConfigurationService.getBoolean("msg.displayEid", true))
                  {

                        return userString + " (" + userEidString + ")";
                  }
+                 else if ((userString != null && userString.length() > 0) && !ServerConfigurationService.getBoolean("msg.displayEid", true))
+                 {
+                   return userString;
+                 }
                  else
                  {
                        return userEidString;