Yeah, probably not worth the effort now. We can get rid of this stuff once we fix the data and refactor EditAccount, then cleanup all checks for if an account is disabled.