diff --git a/operators.py b/operators.py
index 2015658..be65615 100644
--- a/operators.py
+++ b/operators.py
@@ -38,10 +38,17 @@ def client_list_callback(scene, context):
     global client_keys
 
     items = [("Common", "Common", "")]
+
+    username = bpy.context.scene.session_settings.username 
+
     if client_keys:
         for k in client_keys:
             if 'Client' in k[0]:
                 name = k[1]
+                
+                if name == username:
+                    name += " (self)"
+
                 items.append((name, name, ""))
 
     return items
@@ -368,7 +375,7 @@ class session_stop(bpy.types.Operator):
 
 class session_rights(bpy.types.Operator):
     bl_idname = "session.right"
-    bl_label = "close"
+    bl_label = "Change owner to"
     bl_description = "stop net service"
     bl_options = {"REGISTER"}
 
diff --git a/ui.py b/ui.py
index 786c6c5..f813d76 100644
--- a/ui.py
+++ b/ui.py
@@ -147,6 +147,8 @@ class SessionUsersPanel(bpy.types.Panel):
 
         row = layout.row()
 
+def get_client_key(item):
+    return item[0]
 
 class SessionPropertiesPanel(bpy.types.Panel):
     """Creates a Panel in the scene context of the properties editor"""
@@ -182,7 +184,8 @@ class SessionPropertiesPanel(bpy.types.Panel):
             area_msg.operator("session.refresh", text="",
                         icon="UV_SYNC_SELECT")
             if operators.client_keys and len(operators.client_keys) > 0:
-                for item in operators.client_keys:
+
+                for item in sorted(operators.client_keys, key=get_client_key):
                     owner = 'toto'
                     try:
                         owner =  item[1]