Added login verify
Fixed conflicts. alert