Started reworking login form