updated login to check passwd
Merge branch '1-user-authentication'