Have you tried going back to the original code page? Re inputting your 18 digit code now that its somewhat fixed and getting a new 20 digit code?

I know this works, because I got an EU code on Tuesday and a NA code on Wednesday.