Can't connect to Wi-Fi connection?

[Guest LuKa-X]

Hello everybody firstly I must say what a great forum this is. Anyways I just got my first Omnia the other day and I moved over from Symbian based phones and wanted to try a WinMo phone.

I've been trying to connect to my Wi-Fi connection so I can surf the web free of charge and not use the GPRS on my contract. When I do a search it picks up my network fine, I select "The Internet" from the drop down then select the right type of Authentications and Data Encryption (WPA-PSK and AES) I then put in the network key exactly the same as what is in the router settings. I save the settings and then it just hangs saying "Connecting" and doesnt seem to connect I left fpr about 1-2 minutes aswell. The icon at the top shows something is happening. My Omnia has had any mods or anything installed on it just SPB Shell and S2UL and a couple games. My Omnia is Vodafone braded and my software version is ACHH3.

Can anyone help me out? Also I looking into upgrading my firmware via the Samsung website would it be worth doing or will I lose ALL my setting for Vodafone and my phone be useless?

Thanks in advance :D