Bug 995000 - reword form and cleanup htaccess regex
Merge branch 'bug-995000' into development