Add check for multi logins, minor bug fixes