Hello, I've noticed Macs/OSX cannot distinguish between SSIDs with the same name.
I realy don't know if this would work or not, but might try it...
In System Preferences>Network>Wifi/Airport>Advanced, uncheck Remember any Network & remove any there already.
Instead of joining it from the list, click the WiFi icon at the top, and click join other network. Fill in everything as needed..