First name logic fix