diff --git a/ui-v2/app/services/settings.js b/ui-v2/app/services/settings.js
index cc3d8021e..2e51de89a 100644
--- a/ui-v2/app/services/settings.js
+++ b/ui-v2/app/services/settings.js
@@ -16,14 +16,18 @@ export default Service.extend({
     };
   },
   findAll: function(key) {
-    return Promise.resolve({ token: get(this, 'storage').getItem('token') });
+    const token = get(this, 'storage').getItem('token');
+    return Promise.resolve({ token: token === null ? '' : token });
   },
   findBySlug: function(slug) {
+    // TODO: Force localStorage to always be strings...
+    // const value = get(this, 'storage').getItem(slug);
     return Promise.resolve(get(this, 'storage').getItem(slug));
   },
   persist: function(obj) {
     const storage = get(this, 'storage');
     Object.keys(obj).forEach((item, i) => {
+      // TODO: ...everywhere
       storage.setItem(item, obj[item]);
     });
     return Promise.resolve(obj);
diff --git a/ui-v2/tests/acceptance/settings/update.feature b/ui-v2/tests/acceptance/settings/update.feature
new file mode 100644
index 000000000..98ac584d0
--- /dev/null
+++ b/ui-v2/tests/acceptance/settings/update.feature
@@ -0,0 +1,15 @@
+@setupApplicationTest
+Feature: settings / update: Update Settings
+  In order to authenticate with an ACL token
+  As a user
+  I need to be able to add my token via the UI
+  Scenario: I click Save without actually typing anything
+    Given 1 datacenter model with the value "datacenter"
+    When I visit the settings page
+    Then the url should be /settings
+    And I submit
+    Then I have settings like yaml
+    ---
+      token: ''
+    ---
+
diff --git a/ui-v2/tests/acceptance/steps/settings/update-steps.js b/ui-v2/tests/acceptance/steps/settings/update-steps.js
new file mode 100644
index 000000000..960cdf533
--- /dev/null
+++ b/ui-v2/tests/acceptance/steps/settings/update-steps.js
@@ -0,0 +1,10 @@
+import steps from '../steps';
+
+// step definitions that are shared between features should be moved to the
+// tests/acceptance/steps/steps.js file
+
+export default function(assert) {
+  return steps(assert).then('I should find a file', function() {
+    assert.ok(true, this.step);
+  });
+}
diff --git a/ui-v2/tests/acceptance/token-header.feature b/ui-v2/tests/acceptance/token-header.feature
index a1c35b80a..750a3fe74 100644
--- a/ui-v2/tests/acceptance/token-header.feature
+++ b/ui-v2/tests/acceptance/token-header.feature
@@ -12,7 +12,7 @@ Feature: token headers
     headers:
       X-Consul-Token: ''
     ---
-  Scenario: Set a token and then navigate to the index page
+  Scenario: Set the token to [Token] and then navigate to the index page
     Given 1 datacenter model with the value "datacenter"
     When I visit the settings page
     Then the url should be /settings
diff --git a/ui-v2/tests/steps.js b/ui-v2/tests/steps.js
index 4f8b3db00..459d8fd95 100644
--- a/ui-v2/tests/steps.js
+++ b/ui-v2/tests/steps.js
@@ -242,6 +242,15 @@ export default function(assert) {
           `Expected ${num} ${model}s with ${property} set to "${value}", saw ${len}`
         );
       })
+      .then('I have settings like yaml\n$yaml', function(data) {
+        // TODO: Inject this
+        const settings = window.localStorage;
+        Object.keys(data).forEach(function(prop) {
+          const actual = settings.getItem(prop);
+          const expected = data[prop];
+          assert.strictEqual(actual, expected, `Expected settings to be ${expected} was ${actual}`);
+        });
+      })
       .then('I see $property on the $component like yaml\n$yaml', function(
         property,
         component,