Updated origin validation (bug 892604)