diff --git a/src/addons/mod/forum/services/handlers/push-click.ts b/src/addons/mod/forum/services/handlers/push-click.ts
index b0889d412..d57275e23 100644
--- a/src/addons/mod/forum/services/handlers/push-click.ts
+++ b/src/addons/mod/forum/services/handlers/push-click.ts
@@ -46,7 +46,7 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio
         return CoreUtils.isTrueOrOne(notification.notif)
             && notification.moodlecomponent == 'mod_forum'
             && notification.name == 'posts'
-            && !!(notification.contexturl || notification.customdata?.postid);
+            && !!(notification.contexturl || notification.customdata?.discussionid);
     }
 
     /**
diff --git a/src/core/features/login/tests/behat/signup-309.feature b/src/core/features/login/tests/behat/signup-309.feature
index 2abb29a49..f730e3920 100644
--- a/src/core/features/login/tests/behat/signup-309.feature
+++ b/src/core/features/login/tests/behat/signup-309.feature
@@ -2,6 +2,8 @@
 Feature: Test signup in app
   I need basic signup functionality to work
 
+  # These scenarios are duplicated from main because the error message about
+  # non alpha-numeric characters has changed.
   Background:
     Given the following config values are set as admin:
       | registerauth | email |
@@ -27,7 +29,7 @@ Feature: Test signup in app
       | Email address | u1@u1.com |
       | Email (again) | u1@u1.com |
       | First name | User |
-      | Surname | Test |
+      | Last name | Test |
       | City/town | Barcelona |
       | Country | Spain |
     And I press "Create my new account" in the app