Pz and login form fixes