Updated login & register