Fix issue when no lastname is supplied