diff --git a/data/web/inc/functions.admin.inc.php b/data/web/inc/functions.admin.inc.php
index 79c4b9cc..f9aee508 100644
--- a/data/web/inc/functions.admin.inc.php
+++ b/data/web/inc/functions.admin.inc.php
@@ -205,7 +205,7 @@ function admin($_action, $_data = null) {
     case 'delete':
       $usernames = (array)$_data['username'];
       foreach ($usernames as $username) {
-        if ($_SESSION['mailcow_cc_role'] == $username) {
+        if ($_SESSION['mailcow_cc_username'] == $username) {
           $_SESSION['return'][] = array(
             'type' => 'warning',
             'log' => array(__FUNCTION__, $_action, $_data_log),
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index b3a5b856..34872aef 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -406,6 +406,7 @@ function check_login($user, $pass) {
 	$user = strtolower(trim($user));
 	$stmt = $pdo->prepare("SELECT `password` FROM `admin`
 			WHERE `superadmin` = '1'
+			AND `active` = '1'
 			AND `username` = :user");
 	$stmt->execute(array(':user' => $user));
 	$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -632,7 +633,9 @@ function user_get_alias_details($username) {
     ));
   $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
   while ($row = array_shift($run)) {
-    $data['shared_aliases'][] = $row['shared_aliases'];
+    $data['shared_aliases'][$row['shared_aliases']]['public_comment'] = htmlspecialchars($row['public_comment']);
+
+    //$data['shared_aliases'][] = $row['shared_aliases'];
   }
 
   $stmt = $pdo->prepare("SELECT `address` AS `direct_aliases`, `public_comment` FROM `alias`