Fixes to handle login click.]