Improve PIN Modal flow