more work on sites that mangle the username field