How to merge accounts and files?

I have a new computer that no one else will be using but somehow during setup
I created two accounts, one with my first name and one with my first and last
name. When I transferred all my stuff from the old XP computer it ended up
in my John account but somehow, I can only get online for email in my John
Doe account. When I try to download email in my John account I get a window
saying it is trying to connect through a WAN miniport--but it fails. Bottm
line--I end up flipping back and forth fron one account to another and I
don't need two accounts anyway. How can I merge all privileges and data into
one administrator account? Thanks in advance for any help.
--
rich60