2.5 Allowing same Authenticate object to be setup with different settings 

Follow up of #3444