Merge "Fix findExistingAccount to treat underscore properly"