Enabling push notifications does not actually subscribe in some cases

[sam (Sam Saffron)]

Thanks so much for the detailed pull request here, will have someone from the team have a look over the next few weeks!