fix on login and registration
merge