Improving prefix and suffix when form is disabled