diff --git a/cs656/lab2/src/ChatClient.java b/cs656/lab2/src/ChatClient.java
index 0f8e181..7607fed 100644
--- a/cs656/lab2/src/ChatClient.java
+++ b/cs656/lab2/src/ChatClient.java
@@ -213,9 +213,14 @@ public class ChatClient
                     RegistrationInfo[] ris = myPServ.listRegisteredUsers();
                     for (RegistrationInfo ri : ris)
                     {
+                        /* don't send a message to ourselves */
                         if (!ri.getUserName().equals(myUserName))
                         {
-                            sendUserMessage(ri.getUserName(), rest);
+                            /* send message if user available */
+                            if (ri.getStatus())
+                            {
+                                sendUserMessage(ri.getUserName(), rest);
+                            }
                         }
                     }
                 }