login form changes
changes merged
something strange