Improve client side login