Added changes for lookup_identity and intercept_form_submit