diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php
index 3230acfc8d..abc0ffc079 100644
--- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php
+++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php
@@ -44,6 +44,13 @@ class add_webpush extends migration
 					'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'],
 				],
 			],
+			'add_columns'	=> [
+				$this->table_prefix . 'users' => [
+					'COLUMNS'	=> [
+						'user_push_subscriptions'	=> ['MTEXT_UNI', '']
+					],
+				],
+			],
 		];
 	}
 
diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php
index eab1dac681..2532246624 100644
--- a/phpBB/phpbb/notification/method/webpush.php
+++ b/phpBB/phpbb/notification/method/webpush.php
@@ -168,17 +168,15 @@ class webpush extends \phpbb\notification\method\messenger_base
 
 			// add actual web push data
 			$data['data'] = [
+				'title'		=> $this->config['sitename'],
 				'body'		=> $notification->get_title(),
 				'icon'		=> '', // @todo: to be filled?
 				'image'		=> '', // @todo: to be filled?
-				'title'		=> $this->config['sitename'],
 				'url'		=> $notification->get_url(),
 				'user_id'	=> $notification->user_id,
 			];
 			$json_data = json_encode($data);
 
-			// @todo: start implementing actual web push code
-
 			foreach ($user_subscriptions as $subscription)
 			{
 				try