Update with latest login and connection fixes