diff --git a/cmd/webpush.go b/cmd/webpush.go
index 94f45c77..2aec4d7f 100644
--- a/cmd/webpush.go
+++ b/cmd/webpush.go
@@ -16,7 +16,7 @@ func init() {
 var cmdWebPush = &cli.Command{
 	Name:      "webpush",
 	Usage:     "Generate keys, in the future manage web push subscriptions",
-	UsageText: "ntfy web-push [generate-keys]",
+	UsageText: "ntfy webpush [keys]",
 	Category:  categoryServer,
 
 	Subcommands: []*cli.Command{
@@ -24,7 +24,7 @@ var cmdWebPush = &cli.Command{
 			Action:    generateWebPushKeys,
 			Name:      "keys",
 			Usage:     "Generate VAPID keys to enable browser background push notifications",
-			UsageText: "ntfy web-push generate-keys",
+			UsageText: "ntfy webpush keys",
 			Category:  categoryServer,
 		},
 	},
diff --git a/web/index.html b/web/index.html
index 82bae45e..9f4c7b2e 100644
--- a/web/index.html
+++ b/web/index.html
@@ -20,7 +20,6 @@
     <link rel="icon" type="image/png" href="/static/images/favicon.ico" />
 
     <!-- Previews in Google, Slack, WhatsApp, etc. -->
-
     <meta
       name="description"
       content="ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://heckel.io/ntfy."
diff --git a/web/src/components/App.jsx b/web/src/components/App.jsx
index 56d5a765..6087ee22 100644
--- a/web/src/components/App.jsx
+++ b/web/src/components/App.jsx
@@ -57,7 +57,6 @@ const App = () => {
 
 const updateTitle = (newNotificationsCount) => {
   document.title = newNotificationsCount > 0 ? `(${newNotificationsCount}) ntfy` : "ntfy";
-
   window.navigator.setAppBadge?.(newNotificationsCount);
 };
 
diff --git a/web/src/components/Preferences.jsx b/web/src/components/Preferences.jsx
index eeb6ee0c..7fb2753c 100644
--- a/web/src/components/Preferences.jsx
+++ b/web/src/components/Preferences.jsx
@@ -86,7 +86,7 @@ const Notifications = () => {
         <Sound />
         <MinPriority />
         <DeleteAfter />
-        <WebPushEnabled />
+        {config.enable_web_push && <WebPushEnabled />}
       </PrefGroup>
     </Card>
   );
@@ -639,7 +639,7 @@ const ReservationsTable = (props) => {
   };
 
   const handleSubscribeClick = async (reservation) => {
-    await subscribeTopic(config.base_url, reservation.topic);
+    await subscribeTopic(config.base_url, reservation.topic, {});
   };
 
   return (
diff --git a/web/src/components/SubscriptionPopup.jsx b/web/src/components/SubscriptionPopup.jsx
index 7d154ef5..24ce9cbc 100644
--- a/web/src/components/SubscriptionPopup.jsx
+++ b/web/src/components/SubscriptionPopup.jsx
@@ -174,7 +174,6 @@ export const SubscriptionPopup = (props) => {
           <ListItemIcon>
             <Edit fontSize="small" />
           </ListItemIcon>
-
           {t("action_bar_change_display_name")}
         </MenuItem>
         {showReservationAdd && (
@@ -190,7 +189,6 @@ export const SubscriptionPopup = (props) => {
             <ListItemIcon>
               <Lock fontSize="small" color="disabled" />
             </ListItemIcon>
-
             <span style={{ opacity: 0.3 }}>{t("action_bar_reservation_add")}</span>
             <ReserveLimitChip />
           </MenuItem>