diff --git a/multi_user/presence.py b/multi_user/presence.py
index 23921dc..5302f72 100644
--- a/multi_user/presence.py
+++ b/multi_user/presence.py
@@ -406,6 +406,57 @@ class UserNameWidget(Widget):
             blf.color(0, color[0], color[1], color[2], color[3])
             blf.draw(0,  self.username)
 
+class UserModeWidget(Widget):
+    draw_type = 'POST_PIXEL'
+
+    def __init__(
+            self,
+            username):
+        self.username = username
+        self.settings = bpy.context.window_manager.session
+
+    @property
+    def data(self):
+        user = session.online_users.get(self.username)
+        if user:
+            return user.get('metadata')
+        else:
+            return None
+
+    def poll(self):
+        if self.data is None:
+            return False
+
+        scene_current = self.data.get('scene_current')
+        mode_current = self.data.get('mode_current')
+        user_selection = self.data.get('selected_objects')
+
+        return (scene_current == bpy.context.scene.name or
+                mode_current == bpy.context.mode or
+                self.settings.presence_show_far_user) and \
+            user_selection and \
+            self.settings.presence_show_user and \
+            self.settings.enable_presence
+
+    def draw(self):
+        user_selection = self.data.get('selected_objects')
+        
+        for select_obj in user_selection:
+            obj = find_from_attr("uuid", select_obj, bpy.data.objects)
+            if not obj:
+                return
+            else :
+                vertex_pos, vertex_indices = bbox_from_obj(obj)
+            mode_current = self.data.get('mode_current')      
+            color = self.data.get('color')
+            coords = project_to_screen(vertex_pos[1])
+
+        if coords:
+            blf.position(0, coords[0], coords[1]+10, 0)
+            blf.size(0, 16, 72)
+            blf.color(0, color[0], color[1], color[2], color[3])
+            blf.draw(0,  mode_current)
+
 
 class SessionStatusWidget(Widget):
     draw_type = 'POST_PIXEL'
diff --git a/multi_user/timers.py b/multi_user/timers.py
index a4502e4..43d5261 100644
--- a/multi_user/timers.py
+++ b/multi_user/timers.py
@@ -27,7 +27,7 @@ from replication.interface import session
 from replication import porcelain
 
 from . import operators, utils
-from .presence import (UserFrustumWidget, UserNameWidget, UserSelectionWidget,
+from .presence import (UserFrustumWidget, UserNameWidget, UserModeWidget, UserSelectionWidget,
                        generate_user_camera, get_view_matrix, refresh_3d_view,
                        refresh_sidebar_view, renderer)
 
@@ -309,7 +309,8 @@ class ClientUpdate(Timer):
                                   settings.client_color.b,
                                   1),
                         'frame_current': bpy.context.scene.frame_current,
-                        'scene_current': scene_current
+                        'scene_current': scene_current,
+                        'mode_current': bpy.context.mode
                     }
                     porcelain.update_user_metadata(session.repository, metadata)
 
@@ -323,6 +324,9 @@ class ClientUpdate(Timer):
                     local_user_metadata['view_matrix'] = get_view_matrix(
                     )
                     porcelain.update_user_metadata(session.repository, local_user_metadata)
+                elif bpy.context.mode != local_user_metadata['mode_current']:
+                    local_user_metadata['mode_current'] = bpy.context.mode
+                    porcelain.update_user_metadata(session.repository, local_user_metadata)
 
 
 class SessionStatusUpdate(Timer):
@@ -358,13 +362,15 @@ class SessionUserSync(Timer):
                     new_key = ui_users.add()
                     new_key.name = user
                     new_key.username = user
-                    if user != self.settings.username:
-                        renderer.add_widget(
-                            f"{user}_cam", UserFrustumWidget(user))
-                        renderer.add_widget(
-                            f"{user}_select", UserSelectionWidget(user))
-                        renderer.add_widget(
-                            f"{user}_name", UserNameWidget(user))
+                    # if user != self.settings.username:
+                    renderer.add_widget(
+                        f"{user}_cam", UserFrustumWidget(user))
+                    renderer.add_widget(
+                        f"{user}_select", UserSelectionWidget(user))
+                    renderer.add_widget(
+                        f"{user}_name", UserNameWidget(user))
+                    renderer.add_widget(
+                        f"{user}_name", UserModeWidget(user))
 
 
 class MainThreadExecutor(Timer):