CON-105: Submit button code change