Various authentication related changes

Found while testing the s-ramp installer and distro.