DS-1089 Feedback form breaks when hostname is short

Fix for a string index out of bounds error

Rebased #193 on the correct branch (master)