Fix: increase length, is too restrictive

Fix: use company name if lastname and firstname not exists