save contact#envelope_greeting in db

The siebel organization name should not trump what you entered manually. Lines 236 and 235 should be swapped. That's probably true of the `#greeting` method as well, I just didn't think of it before.