diff --git a/lib/browser/controllers/finish.js b/lib/browser/controllers/finish.js
index 297e28be..6875b305 100644
--- a/lib/browser/controllers/finish.js
+++ b/lib/browser/controllers/finish.js
@@ -24,13 +24,11 @@ const angular = require('angular');
 
 require('angular-ui-router');
 require('../modules/selection-state');
-require('../modules/settings');
 require('../modules/image-writer');
 require('../modules/analytics');
 const finish = angular.module('Etcher.controllers.finish', [
   'ui.router',
   'Etcher.selection-state',
-  'Etcher.settings',
   'Etcher.image-writer',
   'Etcher.analytics'
 ]);
@@ -38,18 +36,10 @@ const finish = angular.module('Etcher.controllers.finish', [
 finish.controller('FinishController', function(
   $state,
   SelectionStateService,
-  SettingsService,
   ImageWriterService,
   AnalyticsService
 ) {
 
-  /**
-   * @summary Saved settings
-   * @type Object
-   * @public
-   */
-  this.settings = SettingsService.data;
-
   /**
    * @summary Restart the burning process
    * @function
diff --git a/lib/partials/success.html b/lib/partials/success.html
index 1ca2a5ef..f543d3d4 100644
--- a/lib/partials/success.html
+++ b/lib/partials/success.html
@@ -2,7 +2,9 @@
   <div class="col-xs">
     <div class="box text-center">
       <h3><hero-tick type="success" class="space-right-tiny"></hero-tick> Burn Complete!</h3>
-      <p ng-show="finish.settings.unmountOnSuccess" class="soft">Safely ejected and ready for use</p>
+      <p class="soft"
+        ng-controller="SettingsController as settings"
+        ng-show="settings.storage.unmountOnSuccess">Safely ejected and ready for use</p>
 
       <div class="row center-xs space-vertical-large">
         <div class="col-xs-4 space-medium">