[7.0] Fix issue when no lastname is supplied