Changes for site flow and login