From b1d5a67d78ba59b89c7a8654e4c91d397742854b Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@bigcommerce.com>
Date: Wed, 5 Sep 2018 12:40:01 -0500
Subject: [PATCH] STRF-5396: Resolves incorrect characters showing on Account
 Signup form page in the counrtry dropdown.

---
 CHANGELOG.md                                  |  3 ++-
 templates/components/common/forms/select.html | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 016ef3a17f..3847970754 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
-## Draft
+## Draft 
+- Fix encoding issues on Account Signup Form ("&#039;" characters showing in country name)[#1341] (https://github.com/bigcommerce/cornerstone/pull/1341)
 - Require Webpack config only when used (reduce time to be ready for receiving messages from stencil-cli). [#1334](https://github.com/bigcommerce/cornerstone/pull/1334)
 
 ## 2.3.2 (2018-08-17)
diff --git a/templates/components/common/forms/select.html b/templates/components/common/forms/select.html
index a91bb09258..8186233165 100644
--- a/templates/components/common/forms/select.html
+++ b/templates/components/common/forms/select.html
@@ -1,13 +1,15 @@
-<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} >
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}} data-type="{{private_id}}"
+    {{/if}}>
     <label class="form-label" for="{{id}}_select">{{label}}
         {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}
     </label>
-    <select class="{{class}} form-select" id="{{id}}_select" data-label="{{label}}" aria-required="{{required}}" name="{{name}}"{{#if private_id}}data-field-type="{{private_id}}"{{/if}}>
+    <select class="{{class}} form-select" id="{{id}}_select" data-label="{{label}}" aria-required="{{required}}" name="{{name}}"
+        {{#if private_id}} data-field-type="{{private_id}}" {{/if}}>
         {{#if options}}
-            <option value="">{{chooseprefix}}</option>
-            {{#each options}}
-                <option {{#if selected}} selected {{/if}}value="{{value}}">{{label}}</option>
-            {{/each}}
+        <option value="">{{chooseprefix}}</option>
+        {{#each options}}
+        <option {{#if selected}} selected {{/if}} value="{{value}}">{{{label}}}</option>
+        {{/each}}
         {{/if}}
     </select>
-</div>
+</div>
\ No newline at end of file