diff --git a/live_support/static/live_support/js/live_support.js b/live_support/static/live_support/js/live_support.js
index de719b6..92df0da 100644
--- a/live_support/static/live_support/js/live_support.js
+++ b/live_support/static/live_support/js/live_support.js
@@ -80,7 +80,12 @@ function gotMessages(resp) {
         for (var index in chat.messages) {
             var message = chat.messages[index];
             var new_message_element = $( document.createElement('li'));
-            $(new_message_element).html(message.name + ': ' + message.message);
+            if (message.name != undefined) {
+                $(new_message_element).html(message.message);
+            }
+            else {
+                $(new_message_element).html(message.name + ': ' + message.message);
+            }
             $(new_message_element).attr('id', 'message_' + message.pk);
             $(message_list).append(new_message_element);
             // Add a "new_message" class to the current chat session label
diff --git a/live_support/templates/admin/live_support/chat/change_list.html b/live_support/templates/admin/live_support/chat/change_list.html
index 0940d63..bfb6fa7 100644
--- a/live_support/templates/admin/live_support/chat/change_list.html
+++ b/live_support/templates/admin/live_support/chat/change_list.html
@@ -34,7 +34,7 @@ <h4>{% trans 'Your Chats' %}</h4>
                     <ul>
                     <li class="question">Question: {{ chat.details }}</li>
                     {% for message in chat.messages.all %}
-                        <li id="message_{{ message.id }}">{{ message.name }}: {{ message.message }}</li>
+                        <li id="message_{{ message.id }}">{% if message.name %}{{ message.name }}: {% endif %}{{ message.message }}</li>
                     {% endfor %}
                     </ul>
                     <div class="message_box_container">
diff --git a/live_support/views.py b/live_support/views.py
index 480a00b..59117b6 100644
--- a/live_support/views.py
+++ b/live_support/views.py
@@ -20,6 +20,10 @@ def join_chat(request, chat_id):
     chat = get_object_or_404(Chat, id=chat_id)
     if request.user.is_authenticated():
         chat.agents.add(request.user)
+        message = ChatMessage()
+        name = request.user.first_name or request.user.username
+        message.message = '%s has joined the chat' % name
+        chat.messages.add(message)
     return HttpResponseRedirect(request.META['HTTP_REFERER'])
 
 @permission_required('live_support.chat_admin')