Continuing on login work