wifi password problem with BT Infinity II

Hi, since upgrading to BT Infinity II a month ago I've been unable to connect my Mac Book Pro to my HomeHub 5 through wi-fi. I select my HH from the dropdown menu, but when I am asked for my password, it always responds with "Invalid password" no matter how many different variants I try.

Here's the procedures I've followed to try and solve the problem

• I've copied the password from the bottom of the HH.
• I've turned both the HH and the MBP off and back on again.
• I've reset the modem.
• I've accessed the HH admin page and cut and paste the password from the Advanced settings page

With regards to connection status, I can connect directly through LAN connection. I can also connect to other wi-fi routers as well.

My iphone and ipad can connect to the router through wifi.

I know that this seems to point to a problem with the MBP, but this has only happened since I upgraded to BT. It connected fine when I was with SKY.

I will be asking this question on the BT forums as well.

Thanks in advance for any help.

Martin