Changed login to work with new login from NFF