Moto G XT1028 with Android 5.0.1 doesn't automatically connect with a saved WPS router.

[AC Question]

I have a Moto G XT1028 with Android 5.0.1 and an Optimum D-Link DIR-868L router. Before the Lollipop upgrade, I would connect with WPS, and it would save the router, so every time I came back from work, it would automatically connect. Now, after the Lollipop upgrade, every time I come home I have to connect again (go to settings-advanced, search for WPS, then hold down button on router.) I tried connecting the regular way, but it just says "Authentication problem". How can I get it to automatically connect?