Added additional validation to self-submission