Restructure to handle --custom-auth=bodgeit