diff --git a/.env.example b/.env.example
index e52c38f..10a909b 100644
--- a/.env.example
+++ b/.env.example
@@ -20,6 +20,7 @@ DB_PASSWORD=
 #DB_SSLKEY=/var/www/html/config/ssl/client.key
 
 BROADCAST_DRIVER=log
+MEMCACHED_HOST=memcached
 CACHE_DRIVER=memcached
 QUEUE_CONNECTION=database
 SESSION_DRIVER=file
diff --git a/app/Jobs/AddressPoll.php b/app/Jobs/AddressPoll.php
index 21244db..6a16f39 100644
--- a/app/Jobs/AddressPoll.php
+++ b/app/Jobs/AddressPoll.php
@@ -73,11 +73,6 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
 		];
 	}
 
-	public function uniqueVia(): Repository
-	{
-		return Cache::driver('file');
-	}
-
 	/**
 	 * When calling MessageProcess - we assume that the packet is from a valid source
 	 */
@@ -163,6 +158,6 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
 
 	public function uniqueId(): string
 	{
-		return $this->ao->id;
+		return $this->ao->system_id;
 	}
 }
\ No newline at end of file
diff --git a/app/Jobs/MailSend.php b/app/Jobs/MailSend.php
index af5e22d..41a9acb 100644
--- a/app/Jobs/MailSend.php
+++ b/app/Jobs/MailSend.php
@@ -13,7 +13,7 @@ class MailSend #implements ShouldQueue
 {
 	use Dispatchable;
 
-	private const LOGKEY = 'JCM';
+	private const LOGKEY = 'JMS';
 
 	/**
 	 * @param bool $crash Send crash mail only