Minor changes and Login code tested