diff --git a/admin/manage_users.php b/admin/manage_users.php
index dee9b844..9e424d7f 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -161,7 +161,38 @@ if ($action = hesk_REQUEST('a')) {
     ?>
 <div class="content-wrapper">
     <section class="content">
-    <?php hesk_handle_messages(); ?>
+    <?php
+    hesk_handle_messages();
+
+    // If POP3 fetching is active, no user should have the same email address
+    if ($hesk_settings['pop3'] && hesk_validateEmail($hesk_settings['pop3_user'], 'ERR', 0)) {
+        $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `email` LIKE '".hesk_dbEscape($hesk_settings['pop3_user'])."'");
+
+        if (hesk_dbNumRows($res) > 0) {
+            while ($myuser = hesk_dbFetchAssoc($res)) {
+                if (compare_user_permissions($myuser['id'], $myuser['isadmin'], explode(',', $myuser['categories']) , explode(',', $myuser['heskprivileges']))) {
+                    hesk_show_notice(sprintf($hesklang['pop3_warning'], $myuser['name'], $hesk_settings['pop3_user']) . "<br /><br />" . $hesklang['fetch_warning'], $hesklang['warn']);
+                    break;
+                }
+            }
+        }
+    }
+
+    // If IMAP fetching is active, no user should have the same email address
+    if ($hesk_settings['imap'] && hesk_validateEmail($hesk_settings['imap_user'], 'ERR', 0)) {
+        $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `email` LIKE '".hesk_dbEscape($hesk_settings['imap_user'])."'");
+
+        if (hesk_dbNumRows($res) > 0) {
+            while ($myuser = hesk_dbFetchAssoc($res)) {
+                if (compare_user_permissions($myuser['id'], $myuser['isadmin'], explode(',', $myuser['categories']) , explode(',', $myuser['heskprivileges']))) {
+                    hesk_show_notice(sprintf($hesklang['imap_warning'], $myuser['name'], $hesk_settings['imap_user']) . "<br /><br />" . $hesklang['fetch_warning'], $hesklang['warn']);
+                    break;
+                }
+            }
+        }
+    }
+
+    ?>
     <script language="Javascript" type="text/javascript"><!--
         function confirm_delete() {
             if (confirm('<?php echo addslashes($hesklang['sure_remove_user']); ?>')) {
@@ -261,11 +292,11 @@ if ($action = hesk_REQUEST('a')) {
 
                     /* To edit yourself go to "Profile" page, not here. */
                     if ($myuser['id'] == $_SESSION['id']) {
-                        $edit_code = '<a href="profile.php"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
+                        $edit_code = '<a name="Edit '.$myuser['user'].'" href="profile.php"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
                     } elseif ($myuser['id'] == 1) {
                         $edit_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                     } else {
-                        $edit_code = '<a href="manage_users.php?a=edit&amp;id=' . $myuser['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
+                        $edit_code = '<a name="Edit '.$myuser['user'].'" href="manage_users.php?a=edit&amp;id=' . $myuser['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
                     }
 
                     if ($myuser['isadmin']) {
@@ -278,15 +309,15 @@ if ($action = hesk_REQUEST('a')) {
                     if ($myuser['id'] == 1 || $myuser['id'] == $_SESSION['id']) {
                         $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                     } else {
-                        $remove_code = ' <a href="manage_users.php?a=remove&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
+                        $remove_code = ' <a name="Delete '.$myuser['user'].'" href="manage_users.php?a=remove&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
                     }
 
                     /* Is auto assign enabled? */
                     if ($hesk_settings['autoassign']) {
                         if ($myuser['autoassign']) {
-                            $autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=0&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
+                            $autoassign_code = '<a name="Unassign '.$myuser['user'].'" href="manage_users.php?a=autoassign&amp;s=0&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
                         } else {
-                            $autoassign_code = '<a href="manage_users.php?a=autoassign&amp;s=1&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
+                            $autoassign_code = '<a name="Assign '.$myuser['user'].'" href="manage_users.php?a=autoassign&amp;s=1&amp;id=' . $myuser['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
                         }
                     } else {
                         $autoassign_code = '';
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 602779c6..11334404 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -2092,6 +2092,7 @@ function hesk_getFeatureArray()
         'can_assign_others',    /* User can assign tickets to other staff members */
         'can_view_unassigned',    /* User can view unassigned tickets */
         'can_view_ass_others',    /* User can view tickets that are assigned to other staff */
+        'can_view_ass_by',       /* User can view tickets he/she assigned to others */
         'can_run_reports',        /* User can run reports and see statistics (only allowed categories and self) */
         'can_run_reports_full', /* User can run reports and see statistics (unrestricted) */
         'can_export',            /* User can export own tickets to Excel */
@@ -2100,6 +2101,7 @@ function hesk_getFeatureArray()
         'can_unban_emails',        /* User can delete email address bans. Also enables "can_ban_emails" */
         'can_ban_ips',            /* User can ban IP addresses */
         'can_unban_ips',        /* User can delete IP bans. Also enables "can_ban_ips" */
+        'can_privacy',          /* User can use privacy tools (Anonymize tickets) */
         'can_service_msg',        /* User can manage service messages shown in customer interface */
         'can_email_tpl',    /* User can manage email templates */
         'can_man_ticket_statuses', /* User can manage ticket statuses */