Changes made for password-less connection to NAT