Card origin_node_401 Bug Fixes

Bug 1121067
Bug 1121864