Fix copy-paste error + fix first/last name not required