Reset password fixes and improvements