I did something a little different that worked for me. While upgrading I used my local account then chose a custom install, not express setting. Choose the options I like using then it asked for my Microsoft account. I choose the option to create a new account. Then you get a screen to enter your info and a choice to login with your local account. Choose local account and it is as it always was. That way it doesn't create other user directories and all your apps/programs stay under your account!