Trying to fix account merging