diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 3503b4a7..d2722004 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -21,8 +21,7 @@ ADD antivirus.conf /etc/rspamd/modules.d/antivirus.conf
 
 RUN pip install -U oletools
 
-# Give Nginx/PHP time to restart
-CMD /bin/sleep 30; /usr/bin/rspamd -f -u _rspamd -g _rspamd
+CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
 
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index 5ae5196f..39e0fe35 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -1470,7 +1470,7 @@ function user_get_alias_details($username) {
       WHERE `goto` LIKE :username_goto
       AND `address` NOT LIKE '@%'
       AND `address` != :username_address");
-    $stmt->execute(array(':username_goto' => '%' . $username . '%', ':username_address' => $username));
+    $stmt->execute(array(':username_goto' => '(^|,)'.$username.'($|,)', ':username_address' => $username));
     $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
     while ($row = array_shift($run)) {
       $data['aliases'] = $row['aliases'];
@@ -4719,8 +4719,8 @@ function mailbox_delete_mailbox($postarray) {
       ':username' => $username
     ));
 		$stmt = $pdo->prepare("SELECT `address`, `goto` FROM `alias`
-				WHERE `goto` LIKE :username");
-		$stmt->execute(array(':username' => '%'.$username.'%'));
+				WHERE `goto` REGEXP :username");
+		$stmt->execute(array(':username' => '(^|,)'.$username.'($|,)'));
 		$GotoData = $stmt->fetchAll(PDO::FETCH_ASSOC);
 		foreach ($GotoData as $gotos) {
 			$goto_exploded = explode(',', $gotos['goto']);
@@ -4879,7 +4879,7 @@ function mailbox_get_sender_acl_handles($mailbox) {
   try {
     // Fixed addresses
     $stmt = $pdo->prepare("SELECT `address` FROM `alias` WHERE `goto` LIKE :goto AND `address` NOT LIKE '@%'");
-    $stmt->execute(array(':goto' => '%' . $mailbox . '%'));
+    $stmt->execute(array(':goto' => '(^|,)'.$mailbox.'($|,)'));
     $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
     while ($row = array_shift($rows)) {
       $data['fixed_sender_aliases'][] = $row['address'];
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e1a34c7..8812a704 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,6 +58,7 @@ services:
     rspamd-mailcow:
       image: andryyy/mailcow-dockerized:rspamd
       build: ./data/Dockerfiles/rspamd
+      command: "sleep 25; /usr/bin/rspamd -f -u _rspamd -g _rspamd"
       depends_on:
         nginx-mailcow:
           condition: service_healthy