diff --git a/ui/app/components/status-menu.js b/ui/app/components/status-menu.js
index 9b1e23548b2b..642ff3d8db4a 100644
--- a/ui/app/components/status-menu.js
+++ b/ui/app/components/status-menu.js
@@ -9,6 +9,7 @@ export default Component.extend({
   auth: service(),
   store: service(),
   media: service(),
+  version: service(),
   type: 'cluster',
   itemTag: null,
   partialName: computed('type', function() {
diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/app/templates/components/shamir-flow.hbs
index 4ce757024007..ff8f5302880a 100644
--- a/ui/app/templates/components/shamir-flow.hbs
+++ b/ui/app/templates/components/shamir-flow.hbs
@@ -25,7 +25,7 @@
       </div>
       <div class="message is-list has-copy-button" tabindex="-1">
         {{#let
-            (concat 'vault operator generate-root -otp="' otp '" -decode="' encoded_token '"')
+            (concat 'vault operator generate-root -dr-token -otp="' otp '" -decode="' encoded_token '"')
         as |cmd|}}
           <HoverCopyButton @copyValue={{cmd}} />
           <div class="message-body">
diff --git a/ui/app/templates/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs
index 7fb8357ba013..f2d7862fd27e 100644
--- a/ui/app/templates/partials/status/cluster.hbs
+++ b/ui/app/templates/partials/status/cluster.hbs
@@ -43,7 +43,7 @@
                 }}
               {{/if}}
             </li>
-          {{else if activeCluster.version.isOSS}}
+          {{else if version.isOSS}}
             <li>
               {{#link-to "vault.cluster.replication"}}
                 <div class="level is-mobile">
@@ -68,7 +68,7 @@
       </nav>
       <hr/>
     {{/if}}
-    {{#unless isOSS}}
+    {{#unless version.isOSS}}
       <nav class="menu">
         <div class="menu-label">
           License