Fixed issue where it was not detecting the correct host account on form submission