Connecting to a wireless network in most cases requires either a password or a certificate. Enabling authentication using a social media account within a Wi-Fi network implies that a captive portal or another enterprise solution should be implemented. In this Thesis we propose an alternative approach that combines Extensible Authentication Protocol (EAP) and OpenID Connect (OIDC) protocol in order to create a new EAP method for authentication in Wi-Fi networks with social media or email accounts. More specifically we propose the encapsulation of OIDC protocol messages within EAP packets through a secure TLS tunnel, thus the concept is named PEAP with EAP-OIDC.