fixed js substitution for unregistered users
Merge branch 'refs/heads/feature-form-autocomplete' into develop