Minor simplification to NeedsCd4 calculation
Fixed login dialog for the enter form page