finish support for whr and idp on login page