diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index d7591086b5c..3028bfa8a36 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -171,7 +171,7 @@
 				</div>
 				<div class="gf-form">
 					<span class="gf-form-label width-7">Refresh</span>
-					<select class="input-large tight-form-input" ng-model="current.refresh" ng-options="f for f in ['Never', 'On Dashboard Load', 'On Time Change']"></select>
+					<select class="input-large tight-form-input" ng-model="current.refresh" ng-options="f for f in ['Never', 'On Dashboard Load', 'On Time Change and Dashboard Load']"></select>
 					<tip>When to update the values of this template, will slow down dashboard load / time change</tip>
 				</div>
 			</div>
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index c1086a2a62a..4e5530b82f7 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -24,7 +24,7 @@ function (angular, _, kbn) {
       var promises = [];
       for (var i = 0; i < self.variables.length; i++) {
         var variable = self.variables[i];
-        if (variable.refresh === 'On Time Change') {
+        if (variable.refresh === 'On Time Change and Dashboard Load') {
           promises.push(self.updateOptions(variable));
         }
       }
@@ -71,7 +71,7 @@ function (angular, _, kbn) {
         if (urlValue !== void 0) {
           return self.setVariableFromUrl(variable, urlValue).then(lock.resolve);
         }
-        else if (variable.refresh === 'On Dashboard Load' || variable.refresh === 'On Time Change') {
+        else if (variable.refresh === 'On Dashboard Load' || variable.refresh === 'On Time Change and Dashboard Load') {
           return self.updateOptions(variable).then(function() {
             if (_.isEmpty(variable.current) && variable.options.length) {
               console.log("setting current for %s", variable.name);