Added complete validation checking on login