Don't force opportunity reference if already set

issue4315
review14621002