diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html
index b2bc81eb3..2384dcc19 100644
--- a/static/directives/config/config-setup-tool.html
+++ b/static/directives/config/config-setup-tool.html
@@ -202,6 +202,15 @@
               </div>
             </td>
           </tr>
+          <tr>
+            <td>Allowed expiration periods:</td>
+            <td>
+              <span class="config-list-field" item-title="Tag Expiration Period" binding="config.TAG_EXPIRATION_OPTIONS" item-pattern="[0-9]+(m|w|h|d|s)"></span>
+              <div class="help-text">
+                The expiration periods allowed for configuration. The default tag expiration *must* be in this list.
+              </div>
+            </td>
+          </tr>
           <tr>
             <td>Allow users to select expiration:</td>
             <td>
@@ -214,12 +223,6 @@
               </div>
             </td>
           </tr>
-          <tr ng-if="config.FEATURE_CHANGE_TAG_EXPIRATION">
-            <td>Selectable expiration periods:</td>
-            <td>
-              <span class="config-list-field" item-title="Tag Expiration Period" binding="config.TAG_EXPIRATION_OPTIONS" item-pattern="[0-9]+(m|w|h|d|s)"></span>
-            </td>
-          </tr>
         </table>
       </div>
     </div> <!-- /Time Machine -->