UI login forms improve #32