Fixed issues in enrollment process