Push improvements

This fixes push notifications not being setup after creating a new account.

(Plus fixes issues that should have been discussed during code review. But got merged while i was half way through my review. 😄 )