diff --git a/config/services.yml b/config/services.yml
index 74d250c..bae7146 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -16,6 +16,7 @@ services:
             - '@phpbb.wpn.form_helper'
             - '@language'
             - '@template'
+            - '@notification.method.phpbb.wpn.webpush'
         tags:
             - { name: event.listener }
 
diff --git a/event/listener.php b/event/listener.php
index 203d58e..c3c6caf 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -16,6 +16,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use phpbb\controller\helper as controller_helper;
 use phpbb\webpushnotifications\form\form_helper;
+use phpbb\webpushnotifications\notification\method\webpush;
 use phpbb\language\language;
 use phpbb\template\template;
 
@@ -27,7 +28,7 @@ class listener implements EventSubscriberInterface
 	public static function getSubscribedEvents()
 	{
 		return [
-			'core.ucp_notifications_output_notification_types_modify_template_vars'	=> 'load_template_data',
+			'core.page_header'					=> 'load_template_data',
 			'core.ucp_display_module_before'	=> 'load_language',
 			'core.acp_main_notice'				=> 'compatibility_notice',
 		];
@@ -45,6 +46,9 @@ public static function getSubscribedEvents()
 	/* @var template */
 	protected $template;
 
+	/* @var webpush */
+	protected $webpush;
+
 	/**
 	 * Constructor
 	 *
@@ -52,13 +56,15 @@ public static function getSubscribedEvents()
 	 * @param form_helper $form_helper Form helper object
 	 * @param language $language Language object
 	 * @param template $template Template object
+	 * @param webpush $webpush Webpush notification method object
 	 */
-	public function __construct(controller_helper $controller_helper, form_helper $form_helper, language $language, template $template)
+	public function __construct(controller_helper $controller_helper, form_helper $form_helper, language $language, template $template, webpush $webpush)
 	{
 		$this->controller_helper = $controller_helper;
 		$this->form_helper = $form_helper;
 		$this->language = $language;
 		$this->template = $template;
+		$this->webpush = $webpush;
 	}
 
 	/**
@@ -68,11 +74,8 @@ public function __construct(controller_helper $controller_helper, form_helper $f
 	 */
 	public function load_template_data($event)
 	{
-		if ($event['method_data']['id'] === 'notification.method.phpbb.wpn.webpush')
-		{
-			$template_ary = $event['method_data']['method']->get_ucp_template_data($this->controller_helper, $this->form_helper);
-			$this->template->assign_vars($template_ary);
-		}
+		$template_ary = $this->webpush->get_ucp_template_data($this->controller_helper, $this->form_helper);
+		$this->template->assign_vars($template_ary);
 	}
 
 	/**
diff --git a/styles/prosilver/template/event/ucp_notifications_form_before.html b/styles/all/template/event/overall_header_body_before.html
similarity index 60%
rename from styles/prosilver/template/event/ucp_notifications_form_before.html
rename to styles/all/template/event/overall_header_body_before.html
index b6ce5ca..470c730 100644
--- a/styles/prosilver/template/event/ucp_notifications_form_before.html
+++ b/styles/all/template/event/overall_header_body_before.html
@@ -1,3 +1 @@
-{% if NOTIFICATIONS_WEBPUSH_ENABLE %}
 	{% include('@phpbb_webpushnotifications/ucp_notifications_webpush.html') %}
-{% endif %}
diff --git a/styles/all/template/webpush.js b/styles/all/template/webpush.js
index c326fe1..e362e4a 100644
--- a/styles/all/template/webpush.js
+++ b/styles/all/template/webpush.js
@@ -49,27 +49,29 @@ function PhpbbWebpush() {
 		subscribeButton = document.querySelector('#subscribe_webpush');
 		unsubscribeButton = document.querySelector('#unsubscribe_webpush');
 
-		// Service workers are only supported in secure context
-		if (window.isSecureContext !== true) {
-			subscribeButton.disabled = true;
-			return;
-		}
-
-		if ('serviceWorker' in navigator && 'PushManager' in window) {
-			navigator.serviceWorker.register(serviceWorkerUrl)
-				.then(() => {
-					subscribeButton.addEventListener('click', subscribeButtonHandler);
-					unsubscribeButton.addEventListener('click', unsubscribeButtonHandler);
+		if (subscribeButton && unsubscribeButton) {
+			// Service workers are only supported in secure context
+			if (window.isSecureContext !== true) {
+				subscribeButton.disabled = true;
+				return;
+			}
 
-					updateButtonState();
-				})
-				.catch(error => {
-					console.info(error);
-					// Service worker could not be registered
-					subscribeButton.disabled = true;
-				});
-		} else {
-			subscribeButton.disabled = true;
+			if ('serviceWorker' in navigator && 'PushManager' in window) {
+				navigator.serviceWorker.register(serviceWorkerUrl)
+					.then(() => {
+						subscribeButton.addEventListener('click', subscribeButtonHandler);
+						unsubscribeButton.addEventListener('click', unsubscribeButtonHandler);
+
+						updateButtonState();
+					})
+					.catch(error => {
+						console.info(error);
+						// Service worker could not be registered
+						subscribeButton.disabled = true;
+					});
+			} else {
+				subscribeButton.disabled = true;
+			}
 		}
 	};
 
@@ -127,12 +129,14 @@ function PhpbbWebpush() {
 	 * @param {boolean} subscribed True if subscribed, false if not
 	 */
 	function setSubscriptionState(subscribed) {
-		if (subscribed) {
-			subscribeButton.classList.add('hidden');
-			unsubscribeButton.classList.remove('hidden');
-		} else {
-			subscribeButton.classList.remove('hidden');
-			unsubscribeButton.classList.add('hidden');
+		if (subscribeButton && unsubscribeButton) {
+			if (subscribed) {
+				subscribeButton.classList.add('hidden');
+				unsubscribeButton.classList.remove('hidden');
+			} else {
+				subscribeButton.classList.remove('hidden');
+				unsubscribeButton.classList.add('hidden');
+			}
 		}
 	}
 
@@ -282,6 +286,61 @@ function PhpbbWebpush() {
 
 		return outputArray;
 	}
+
+	/**
+	 * Handler for sending web push notification request to browser
+	 *
+	 * @returns {Promise<void>}
+	 */
+	this.sendWebpushRequestToBrowser = async function() {
+
+		const permission = Notification.permission;
+		if (permission !== 'granted' && permission !== 'denied') {
+			// Prevent the user from clicking the subscribe button multiple times.
+			const result = await Notification.requestPermission();
+			if (result === 'denied') {
+				return;
+			} else if (result === 'granted') {
+
+				subscribeButton = document.querySelector('#subscribe_webpush');
+				unsubscribeButton = document.querySelector('#unsubscribe_webpush');
+
+				const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl);
+
+				// We might already have a subscription that is unknown to this instance of phpBB.
+				// Unsubscribe before trying to subscribe again.
+				if (typeof registration !== 'undefined') {
+					const subscribed = await registration.pushManager.getSubscription();
+					if (subscribed) {
+						await subscribed.unsubscribe();
+					}
+				}
+
+				const newSubscription = await registration.pushManager.subscribe({
+					userVisibleOnly: true,
+					applicationServerKey: urlB64ToUint8Array(vapidPublicKey),
+				});
+
+				fetch(subscribeUrl, {
+					method: 'POST',
+					headers: {
+						'X-Requested-With': 'XMLHttpRequest',
+					},
+					body: getFormData(newSubscription),
+				})
+					.then(response => {
+						if (subscribeButton && unsubscribeButton) {
+							updateButtonState();
+						}
+						return response.json();
+					})
+					.then(handleSubscribe)
+					.catch(error => {
+						phpbb.alert(ajaxErrorTitle, error);
+					});
+			}
+		}
+	}
 }
 
 function domReady(callBack) {
@@ -297,4 +356,5 @@ phpbb.webpush = new PhpbbWebpush();
 domReady(() => {
 	/* global phpbbWebpushOptions */
 	phpbb.webpush.init(phpbbWebpushOptions);
+	phpbb.webpush.sendWebpushRequestToBrowser();
 });