diff --git a/ui/app/templates/vault/cluster/init.hbs b/ui/app/templates/vault/cluster/init.hbs
index 4d4f722df84b..f6a50ff33572 100644
--- a/ui/app/templates/vault/cluster/init.hbs
+++ b/ui/app/templates/vault/cluster/init.hbs
@@ -1,15 +1,16 @@
 <SplashPage as |Page|>
   {{#if keyData}}
     <Page.header>
-      {{#with (or keyData.recovery_keys keyData.keys) as |keyArray|}}
+      {{#let (or keyData.recovery_keys keyData.keys) as |keyArray|}}
         <h1 class="title is-4">
-          Vault has been initialized! {{#if (eq keyArray.length 1)}}
+          Vault has been initialized!
+          {{#if (eq keyArray.length 1)}}
             Here is your key.
           {{else}}
             Here are your {{pluralize keyArray.length "key"}}.
           {{/if}}
         </h1>
-      {{/with}}
+      {{/let}}
     </Page.header>
     <Page.content>
       <div class="box is-marginless is-shadowless">
@@ -29,8 +30,14 @@
             {{/if}}
           </p>
         </div>
-        <div class="message is-list is-highlight has-copy-button" tabindex="-1">
-          <HoverCopyButton @alwaysShow=true @copyValue={{keyData.root_token}} />
+        <div
+          class="message is-list is-highlight has-copy-button"
+          tabindex="-1"
+        >
+          <HoverCopyButton
+            @alwaysShow=true
+            @copyValue={{keyData.root_token}}
+          />
           <div class="message-body">
             <h4 class="title is-7 is-marginless">
               Initial Root Token
@@ -38,8 +45,12 @@
             <code class="is-word-break">{{keyData.root_token}}</code>
           </div>
         </div>
-        {{#each (or keyData.recovery_keys_base64 keyData.recovery_keys keyData.keys_base64 keyData.keys) as |key index| }}
-          <div data-test-key-box class="message is-list has-copy-button" tabindex="-1">
+        {{#each (or keyData.recovery_keys_base64 keyData.recovery_keys keyData.keys_base64 keyData.keys) as |key index|}}
+          <div
+            data-test-key-box
+            class="message is-list has-copy-button"
+            tabindex="-1"
+          >
             <HoverCopyButton @copyValue={{key}} />
             <div class="message-body">
               <h4 class="title is-7 is-marginless">
@@ -53,20 +64,36 @@
       <div class="box is-marginless is-shadowless">
         <div class="field is-grouped-split">
           {{#if (and model.sealed (not keyData.recovery_keys))}}
-            <div data-test-advance-button class="control">
+            <div
+              data-test-advance-button
+              class="control"
+            >
               {{#link-to 'vault.cluster.unseal' model.name class="button is-primary"}}
                 Continue to Unseal
               {{/link-to}}
             </div>
           {{else}}
-            <div data-test-advance-button class="control">
-              {{#link-to 'vault.cluster.auth' model.name class=(concat (if model.sealed 'is-loading ' '') 'button is-primary') disabled=model.sealed}}
+            <div
+              data-test-advance-button
+              class="control"
+            >
+              {{#link-to 'vault.cluster.auth'
+                model.name
+                class=(concat (if model.sealed 'is-loading ' '') 'button is-primary')
+                disabled=model.sealed
+              }}
                 Continue to Authenticate
               {{/link-to}}
             </div>
           {{/if}}
-          <DownloadButton @data={{keyData}} @filename={{keyFilename}} @mime="application/json" @extension="json" @class="button is-ghost"
-            @stringify={{true}}>
+          <DownloadButton
+            @data={{keyData}}
+            @filename={{keyFilename}}
+            @mime="application/json"
+            @extension="json"
+            @class="button is-ghost"
+            @stringify={{true}}
+          >
             <ICon @glyph="download" @size=16 /> Download Keys
           </DownloadButton>
         </div>
@@ -81,67 +108,112 @@
     <Page.content>
       <form
         {{action 'initCluster' (hash
-         secret_shares=secret_shares
-         secret_threshold=secret_threshold
-         pgp_keys=pgp_keys
-         use_pgp=use_pgp
-         use_pgp_for_root=use_pgp_for_root
-         root_token_pgp_key=root_token_pgp_key
+          secret_shares=secret_shares
+          secret_threshold=secret_threshold
+          pgp_keys=pgp_keys
+          use_pgp=use_pgp
+          use_pgp_for_root=use_pgp_for_root
+          root_token_pgp_key=root_token_pgp_key
          )
          on="submit"
        }}
-        id="init">
+        id="init"
+      >
         <div class="box is-marginless is-shadowless">
           <MessageError @errors={{errors}} />
           <div class="field">
-            <label for="key-shares" class="is-label">
+            <label
+              for="key-shares"
+              class="is-label"
+            >
               Key Shares
             </label>
             <div class="control">
-              {{input data-test-key-shares="true" class="input" autocomplete="off" name="key-shares" type="number" step="1" min="1" pattern="[0-9]*" value=secret_shares}}
+              {{input 
+                data-test-key-shares="true" 
+                class="input" 
+                autocomplete="off" 
+                name="key-shares" 
+                type="number"
+                step="1" 
+                min="1" 
+                pattern="[0-9]*" 
+                value=secret_shares
+              }}
             </div>
             <p class="help has-text-grey">
               The number of key shares to split the master key into
             </p>
           </div>
           <div class="field">
-            <label for="key-threshold" class="is-label">
+            <label
+              for="key-threshold"
+              class="is-label"
+            >
               Key Threshold
             </label>
             <div class="control">
-              {{input data-test-key-threshold="true" class="input" autocomplete="off" name="key-threshold" type="number" step="1" min="1" pattern="[0-9]*" value=secret_threshold}}
+              {{input 
+                data-test-key-threshold="true" 
+                class="input" autocomplete="off" 
+                name="key-threshold" 
+                type="number"
+                step="1"
+                min="1"
+                pattern="[0-9]*"
+                value=secret_threshold
+              }}
             </div>
             <p class="help has-text-grey">
               The number of key shares required to reconstruct the master key
             </p>
           </div>
-
-          <ToggleButton @openLabel="Encrypt Output with PGP" @closedLabel="Encrypt Output with PGP" @toggleTarget={{this}}
-            @toggleAttr="use_pgp" @class="is-block" />
+          <ToggleButton
+            @openLabel="Encrypt Output with PGP"
+            @closedLabel="Encrypt Output with PGP"
+            @toggleTarget={{this}}
+            @toggleAttr="use_pgp"
+            @class="is-block"
+          />
           {{#if use_pgp}}
             <div class="box init-box">
               <p class="help has-text-grey">
                 The output unseal keys will be encrypted and hex-encoded, in order, with the given public keys.
               </p>
-              <PgpList @listLength={{secret_shares}} @onDataUpdate={{action 'setKeys'}} />
+              <PgpList
+                @listLength={{secret_shares}}
+                @onDataUpdate={{action 'setKeys'}}
+              />
             </div>
           {{/if}}
-          <ToggleButton @openLabel="Encrypt Root Token with PGP" @closedLabel="Encrypt Root Token with PGP"
-            @toggleTarget={{this}} @toggleAttr="use_pgp_for_root" @class="is-block" />
+          <ToggleButton
+            @openLabel="Encrypt Root Token with PGP"
+            @closedLabel="Encrypt Root Token with PGP"
+            @toggleTarget={{this}}
+            @toggleAttr="use_pgp_for_root"
+            @class="is-block"
+          />
           {{#if use_pgp_for_root}}
             <div class="box init-box">
               <p class="help has-text-grey">
                 The root unseal key will be encrypted and hex-encoded with the given public key.
               </p>
-              <PgpList @listLength=1 @onDataUpdate={{action 'setRootKey'}} />
+              <PgpList
+                @listLength=1
+                @onDataUpdate={{action 'setRootKey'}}
+              />
             </div>
           {{/if}}
         </div>
         <div class="box is-marginless is-shadowless">
-          <button data-test-init-submit type="submit" class="button is-primary {{if loading 'is-loading'}}" disabled={{loading}}>
+          <button
+            data-test-init-submit
+            type="submit"
+            class="button is-primary {{if loading 'is-loading'}}"
+            disabled={{loading}}
+          >
             Initialize
           </button>
-
           <div class="init-illustration">
             {{partial "svg/initialize"}}
           </div>