Peap authendication

Hi,

I just spent 30 minutes trying to connect my laptop to my peap network.

At first i clicked on connect on the wifi in windows 7, then it asked for a username and password, which i then typed in.

It still did not connect.

Then i went to the server and exported the certificate to a usb stick and imported it into the trusted root if my laptop.

After that it connected.

My question is is there any way in which this can be simplified so that i do not have to copy the certificate onto a stick each time i want to connect a new laptop?

Thanks