iCloud on Windows 10 - Verification Problem

Hi All,

I installed iCloud for Windows on my Windows 10 laptop yesterday but I can't use it.

If I launch iCloud and enter my username and password I'm prompted for a verification code because I have two-step authentication enabled. The code comes through to my device but when I type it in it just says "verifying". It doesn't go any further and I get no error message. I left it running last night and 6 hours later it still said the same thing.

I have tried sending the code via text, and direct to the device but doesn't make any difference. Uninstalling and re-installing iCloud makes no difference.

I logged in to my wifes' user account and launched iCloud. Entered her username and password and it works fine. The only difference is that she does NOT have 2-step authentication enabled.

My Apple 2-step works fine for all other Apple related things though.

Anyone have the same issue or know how to resolve it other than disabling 2-step which I don't think should be necessary?