Just remember that neither of these are an adequate security measure - they will only prevent novice users.
It's pretty trivial for someone to bypass your wireless security if all you've done is hide your SSID or enable mac address filtering - most WiFi connection hunting software you can...