Thanks to everyone for replying so quickly, and big thanks to dc42!
I installed the DuetWiFiServer firmware from the 2.03 beta1 as you suggested and then ran M552 S0 before M587 and it worked like a charm 🙂

Got my IP now so time to set it all up!

Thanks again to everyone, no more issues here.