diff --git a/public_server/public_server.php b/public_server/public_server.php
index 549020bd2..bb7ebec94 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -58,12 +58,9 @@ function public_server_cron($a, $b)
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			notification([
-				'uid' => $rr['uid'],
 				'type' => Type::SYSTEM,
+				'uid' => $rr['uid'],
 				'system_type' => 'public_server_expire',
-				'language'     => $rr['language'],
-				'to_name'      => $rr['username'],
-				'to_email'     => $rr['email'],
 				'source_name'  => DI::l10n()->t('Administrator'),
 				'source_link'  => DI::baseUrl()->get(),
 				'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 1806ea2cc..f0d29e0e0 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -58,12 +58,9 @@ function testdrive_cron($a,$b) {
 	if(count($r)) {
 		foreach($r as $rr) {
 			notification([
-				'uid' => $rr['uid'],
 				'type' => Type::SYSTEM,
+				'uid' => $rr['uid'],
 				'system_type' => 'testdrive_expire',
-				'language'     => $rr['language'],
-				'to_name'      => $rr['username'],
-				'to_email'     => $rr['email'],
 				'source_name'  => DI::l10n()->t('Administrator'),
 				'source_link'  => DI::baseUrl()->get(),
 				'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',