fixing validation issues around pin change