Better handling of user authentication options and host parameter