Reverted issue with first name completion