v.0.5.2 - login logic changed