Make merging users optional + handle admin separately