diff --git a/admin/themes/default/js/user_list.js b/admin/themes/default/js/user_list.js
index d5af05eec..e3f4f043e 100644
--- a/admin/themes/default/js/user_list.js
+++ b/admin/themes/default/js/user_list.js
@@ -1060,13 +1060,11 @@ function set_selected_groups(groups) {
 
 function fill_user_edit_summary(user_to_edit, pop_in) {
     pop_in.find('.user-property-initials span').html(get_initials(user_to_edit.username)).removeClass(color_icons.join(' ')).addClass(color_icons[user_to_edit.id % 5]);
-    pop_in.find('.user-property-username span:first').html(user_to_edit.username);
-    if (user_to_edit.id === connected_user) {
+    pop_in.find('.user-property-username span:first').html(user_to_edit.username); 
+    if (user_to_edit.id === connected_user || user_to_edit.id === 1) {
         pop_in.find('.user-property-username .edit-username-specifier').show();
-        pop_in.find('.delete-user-button').hide();
     } else {
         pop_in.find('.user-property-username .edit-username-specifier').hide();
-        pop_in.find('.delete-user-button').show();
     }
     pop_in.find('.user-property-username-change input').val(user_to_edit.username);
     pop_in.find('.user-property-password-change input').val('');
@@ -1145,12 +1143,81 @@ function fill_user_edit_update(user_to_edit, pop_in) {
     })
 }
 
+function fill_user_edit_permissions(user_to_edit, pop_in) {
+  if (user_to_edit.id != connected_user) {
+    // I'm not the connected user
+    if (!is_owner(connected_user)) {
+      // I'm not the owner, you need to test my permissions
+      if (is_owner(user_to_edit.id)) {
+        // I want to edit the owner but I'm not the owner (No matter my status)
+        pop_in.find(".delete-user-button").hide();
+        pop_in.find(".user-property-password.edit-password").addClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").attr('disabled','disabled');
+        pop_in.find(".user-property-status .user-property-select").addClass("notClickable");
+        pop_in.find(".user-property-username .edit-username").hide();
+      } else {
+        pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+        pop_in.find(".user-property-status .user-property-select").removeClass("notClickable");
+        pop_in.find(".user-property-username .edit-username").show();
+      }
+      
+      if (user_to_edit.status == connected_user_status && connected_user_status == "webmaster" && !is_owner(user_to_edit.id)) {
+        // I have the same status than the user I want to edit and I'm a webmaster, I can do whatever I want
+        pop_in.find(".delete-user-button").show();
+        pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+        pop_in.find(".user-property-status .user-property-select").removeClass("notClickable");
+        pop_in.find(".user-property-username .edit-username").show();
+      } else if (user_to_edit.status == connected_user_status && connected_user_status == "admin") {
+        // I have the same status than the user I want to edit and I'm an admin, I can do whatever I want but edit the status
+        pop_in.find(".delete-user-button").hide();
+        pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+        pop_in.find(".user-property-username .edit-username").removeClass("notClickable");
+        pop_in.find(".user-property-status .user-property-select").hide();
+      } else if (user_to_edit.status == "webmaster" && connected_user_status == "admin") {
+        // I'm admin and I want to edit webmaster
+        pop_in.find(".user-property-password.edit-password").addClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").attr('disabled','disabled');
+        pop_in.find(".user-property-status .user-property-select").addClass("notClickable");
+        pop_in.find(".user-property-username .edit-username").hide();
+      } else if (user_to_edit.status == "admin" && connected_user_status == "webmaster") {
+        // I'm webmaster and I want to edit admin
+        pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+        pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+        pop_in.find(".user-property-status .user-property-select").removeClass("notClickable");
+        pop_in.find(".user-property-username .edit-username").show();
+      }
+    } else {
+      // I'm the owner, I can do whatever I want. No need to test, I am GOD here
+      pop_in.find(".delete-user-button").show();
+      pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+      pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+      pop_in.find(".user-property-status .user-property-select").removeClass("notClickable");
+      pop_in.find(".user-property-username .edit-username").show();
+    }
+  } else {
+    // I'm the connected user, I can do whatever I want on my profile but kill myself (Suicide is not allowed)
+    pop_in.find(".delete-user-button").hide();
+    pop_in.find(".user-property-password.edit-password").removeClass("notClickable");
+    pop_in.find(".user-property-email .user-property-input").removeAttr('disabled');
+    pop_in.find(".user-property-status .user-property-select").removeClass("notClickable");
+    pop_in.find(".user-property-username .edit-username").show();
+  }
+}
+
+function is_owner(user_id) {
+  return user_id === owner_id;
+}
+
 function fill_user_edit(user_to_edit) {
     let pop_in = $('.UserListPopInContainer');
     fill_user_edit_summary(user_to_edit, pop_in);
     fill_user_edit_properties(user_to_edit, pop_in);
     fill_user_edit_preferences(user_to_edit, pop_in);
     fill_user_edit_update(user_to_edit, pop_in);
+    fill_user_edit_permissions(user_to_edit, pop_in);
 }
 
 function fill_guest_edit() {
@@ -1172,7 +1239,12 @@ function fill_ajax_data_from_properties(ajax_data, pop_in) {
     } ).get();
     console.log(groups_selected);
     ajax_data['email'] = pop_in.find('.user-property-email input').val();
-    ajax_data['status'] = pop_in.find('.user-property-status select').val();
+    if (connected_user_status == "admin" && pop_in.find('.user-property-status select').val() != "webmaster" && pop_in.find('.user-property-status select').val() != "admin") {
+      ajax_data['status'] = pop_in.find('.user-property-status select').val();
+    } else if (connected_user_status == "webmaster"){
+      ajax_data['status'] = pop_in.find('.user-property-status select').val();
+    }
+    console.log(ajax_data['status']);
     ajax_data['level'] = pop_in.find('.user-property-level select').val();
     ajax_data['group_id'] = groups_selected.length == 0 ? -1 : groups_selected;
     ajax_data['enabled_high'] = pop_in.find('.user-list-checkbox[name="hd_enabled"]').attr('data-selected') == '1' ? true : false ;
diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl
index ca087b448..03eae0181 100644
--- a/admin/themes/default/template/user_activity.tpl
+++ b/admin/themes/default/template/user_activity.tpl
@@ -22,6 +22,7 @@ jQuery(".cancel-icon").click(function() {
 });
 
 const color_icons = ["icon-red", "icon-blue", "icon-yellow", "icon-purple", "icon-green"];
+const users_key = "{"Users"|@translate}"
 
 {*<-- Translation keys -->*}
 
@@ -552,7 +553,7 @@ function lineConstructor(line) {
         newLine.find(".detail-item-3").attr('title', line.details.agent);
     } else if (line.details.users_string && line.action != "logout" && line.action != "login") {
         newLine.find(".detail-item-3").html(line.details.users_string);
-        newLine.find(".detail-item-3").attr('title', line.details.users_string);
+        newLine.find(".detail-item-3").attr('title', users_key + ": " +line.details.users_string);
     } else {
         newLine.find(".detail-item-3").remove();
     }
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 3d439a134..a17cb5f34 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -51,6 +51,8 @@ months = [
 
 /* Template variables */
 connected_user = {$connected_user};
+connected_user_status = "{$connected_user_status}";
+owner_id = {$owner};
 let groups_arr_name = [{$groups_arr_name}];
 let groups_arr_id = [{$groups_arr_id}];
 groups_arr = groups_arr_id.map((elem, index) => [elem, groups_arr_name[index]]);
@@ -560,7 +562,7 @@ $(".icon-help-circled").tipTip({
           </div>
           <div class="user-property-email">
             <p class="user-property-label">{'Email Adress'|@translate}</p>
-            <input type="text" class="user-property-input" value="contact@jessy-pinkman.com" />
+            <input type="text" class="user-property-input" value="contact@jessy-pinkman.com" disabled="false"/>
           </div>
           <div class="user-property-status">
             <p class="user-property-label">{'Status'|@translate}
@@ -2353,4 +2355,12 @@ Advanced filter
   display:inline-block;
   max-width:500px;
 }
+
+.notClickable {
+  pointer-events: none;
+}
+
+.notClickable:hover {
+  cursor: not-allowed;
+}
 </style>
diff --git a/admin/user_list.php b/admin/user_list.php
index 21c68af52..59805edd1 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -114,7 +114,9 @@ $template->assign(
     'password_protected_users' => implode(',', array_unique($password_protected_users)),
     'guest_user' => $conf['guest_id'],
     'filter_group' => (isset($_GET['group']) ? $_GET['group'] : null),
-    'connected_user' => $user["id"]
+    'connected_user' => $user["id"],
+    'connected_user_status' => $user['status'],
+    'owner' => $conf['webmaster_id']
     )
   );