Updated login work