Trying to fix account merging problem