Fix user merge failing if both parties did not have a timezone specified