BB Torch :: 9800 - Email Setup Not Giving Option To Add Account?

I just installed the newest OS for my Torch 9800 (6.0 Bundle 2647). I lost all of my passwords and email accounts. Just go to Setup, select Email Accounts and add all of my accounts back. When I go to Setup there are 2 envelope icons that say "Email Accounts" where there used to be only 1. When I click on either of them it takes me to the "Select the type of email account type:"

Here we have 2 options: Internet Mail Account or Enterprise Account. When I click on Internet Mail Account it takes me right back to Setup, so I select "Email Accounts" again, and then Internet Mail Account and again my phone goes right back to Setup. It just goes around and around in circles and never gives me the option of actually adding an email account. From setup to select type and right back to setup. I have taken the battery out to no avail.