Do not switch the Primary and Spouse! You can not switch or it will mess up your return. The year your spouse dies you still file a Joint return. Then the next year you will have to set up your own new account.
