This branch fixes #1189 (closed) by launching SetupActivity in the same task after deleting the account, and also ensures that PasswordActivity and the activity that launched it are cleaned up if the user presses back from SetupActivity.