Maddy - hopefully your normal account will now work. I tried to merge it onto the new one, and couldn't, got errors, which suggested the database had problems. So it looks like yesterday, either the database server crashed and took Windows with it, or Windows crashed and took the database server with it, and you just had the bad luck to be doing something in the middle of that time, so that your account got locked.
Anyway, let me know if you still have problems!
Lady p, you should have access now