more work on login..