Add user validation and fix error messages.