diff --git a/static/js/popovers.js b/static/js/popovers.js
index e11fa9d406..943cab0d71 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -266,6 +266,7 @@ exports.show_user_profile = function (user) {
         last_seen: user_last_seen_time_status(user.user_id),
         user_time: people.get_user_time(user.user_id),
         user_type: people.get_user_type(user.user_id),
+        user_is_guest: user.is_guest,
     };
 
     $("#user-profile-modal-holder").html(templates.render("user_profile_modal", args));
diff --git a/static/styles/popovers.scss b/static/styles/popovers.scss
index c9dd446b92..d28796ed5b 100644
--- a/static/styles/popovers.scss
+++ b/static/styles/popovers.scss
@@ -172,6 +172,10 @@ ul.remind_me_popover .remind_icon {
         border-radius: 5px;
         margin-right: 10px;
         border: 1px solid hsla(0, 0%, 0%, 0.2);
+
+        &.guest-avatar::after {
+            outline: 9px solid hsl(0, 0%, 100%);
+        }
     }
 
     #default-section {
diff --git a/static/templates/user_profile_modal.handlebars b/static/templates/user_profile_modal.handlebars
index 76052d6f4c..fdba6d3716 100644
--- a/static/templates/user_profile_modal.handlebars
+++ b/static/templates/user_profile_modal.handlebars
@@ -4,7 +4,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="{{t 'Close' }}">
             <span aria-hidden="true" id="exit-sign">&times;</span>
         </button>
-        <div id="avatar" style="background-image: url('{{user_avatar}}');" ></div>
+        <div id="avatar"{{#if user_is_guest}} class="guest-avatar"{{/if}} style="background-image: url('{{user_avatar}}');" ></div>
         <div id="default-section">
             <div id="name">
                 {{full_name}}