Further validation changes to login page