Small correction for service form
Merge branch 'master' into test-FAN