Added username/password encryption