Added 'if' block to form to select current option