Index: site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteInfoToolServlet.java
===================================================================
--- site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteInfoToolServlet.java      (revision 2150)
+++ site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteInfoToolServlet.java      (revision 2151)
@@ -329,7 +329,7 @@
                                Element participantNode = doc.createElement(PARTICIPANT_NODE_NAME);

                                // participant name
-                               String participantName= participant.getName();
+                               String participantName= participant.getDisplayName();
                                if (participant.getDisplayId() != null)
                                {
                                        participantName +="( " +  participant.getDisplayId() + " )";

Index: site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
===================================================================
--- site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm        (revision 2150)
+++ site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm        (revision 2151)
@@ -400,7 +400,7 @@
                                        <tr>
                                                <td headers="name">
                                                        <h5>
-                                                               #set ($participantName=$participant.getName())
+                                                               #set ($participantName=$participant.getDisplayName())
                                                                #if ($participantName ==", ")
                                                                #else
                                                                        $validator.escapeHtml($participantName)

Index: site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
===================================================================
--- site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java       (revision 2158)
+++ site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java       (revision 2159)
@@ -6593,6 +6593,9 @@
                                                                }
                                                        }
                                                } catch (UserNotDefinedException e) {
+                                                       // add non-registered participant
+                                                       realmEdit.removeMember(rId);
+
                                                        M_log.warn(this + ".doUpdate_participant: IdUnusedException " + rId + ". ", e);
                                                }
                                        }
@@ -11861,5 +11864,20 @@
                }
        }

+       public static String makeUserDisplayName(String userId) {
+               String userDisplayName = NULL_STRING;
+               String at = "@";
+
+               if (userId.indexOf(at) == -1) {
+               // non-email
+                       userDisplayName = userId + " [deregistered]";
+               } else {
+               // email
+                       userDisplayName = userId + " [pending]";
+               }
+
+               return userDisplayName;
+       }
+
 }