HMRC to change registration for self-assessment