PS4 Collector's Edition upgrade

Good afternoon,

I'm a veteran player, having played the original Windows version and later the PS3 version. I participated in both the closed and open PS4 betas. On impulse, I decided to order the PS4 collector's edition of the game from Amazon, who sent me a download code on April 11 to download the game from the PSN store before the game arrived in the mail. I did that, and upgraded my PS3 account to PS4...but now my account type is showing in Mog Station as "Standard" with the option to upgrade to the digital collector's edition. Is there a code I need to input somewhere? I got the Sith Cat and Moogle hat items in the mail, but that is all.

After reading up on this issue, I realized that the code that I got from Amazon was not the correct code for the collector's edition of the game, so I registered the code that came in the box on the PSN store which unlocked the CE content. I was told to restart the game client and re-login to use the new content, however it wouldn't let me use my existing service account so the only way to log in was to add another service account which I don't actually need...but has the CE bonus content linked to it. Can I just have the PS4 CE in my current service account and kill the new one?