improve push registration behaviour