tweaks with login and popup warning