updated facbook login + login with user name and password