Fixed an issue where the push notification fields were not getting
cleared properly