CDB-1692 Saving in named map the auth token + password incorrect improvements