bug-1304: Update the descriptive text to match the new form
Merge branch 'bug-1304' into testserver-stable