Merged the current location and login functionality, added IP address to the xsd