Fix account merging functionality