OpenId reintegration after code rearranging. Configuration file udpate.