Fix requrires for enable_support_account
Land #2042, quick fix for enable_support_account