diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index 061516f90b63..1dacc09a54e3 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -41,6 +41,7 @@ import {
   DOMAIN_STORE,
   DARK_MODE,
   CUSTOM_COLUMNS,
+  MS_ID,
   OAUTH_DOMAIN,
   OAUTH_PROVIDER,
   LATEST_CS_VERSION
@@ -151,6 +152,7 @@ const user = {
     },
     SET_MS_ID: (state, msId) => {
       state.msId = msId
+      vueProps.$localStorage.set(MS_ID, msId)
     },
     SET_MAINTENANCE_INITIATED: (state, maintenanceInitiated) => {
       state.maintenanceInitiated = maintenanceInitiated
@@ -311,6 +313,7 @@ const user = {
         const domainStore = vueProps.$localStorage.get(DOMAIN_STORE, {})
         const cachedShowSecurityGroups = vueProps.$localStorage.get(SHOW_SECURTIY_GROUPS, false)
         const darkMode = vueProps.$localStorage.get(DARK_MODE, false)
+        const msId = vueProps.$localStorage.get(MS_ID, false)
         const latestVersion = vueProps.$localStorage.get(LATEST_CS_VERSION, { version: '', fetchedTs: 0 })
         const hasAuth = Object.keys(cachedApis).length > 0
 
@@ -325,6 +328,7 @@ const user = {
           commit('SET_TIMEZONE_OFFSET', cachedTimezoneOffset)
           commit('SET_USE_BROWSER_TIMEZONE', cachedUseBrowserTimezone)
           commit('SET_CUSTOM_COLUMNS', cachedCustomColumns)
+          commit('SET_MS_ID', msId)
 
           // Ensuring we get the user info so that store.getters.user is never empty when the page is freshly loaded
           api('listUsers', { username: Cookies.get('username'), listall: true }).then(response => {
diff --git a/ui/src/store/mutation-types.js b/ui/src/store/mutation-types.js
index 94f28beabdf5..0b1f921ab86e 100644
--- a/ui/src/store/mutation-types.js
+++ b/ui/src/store/mutation-types.js
@@ -40,6 +40,7 @@ export const LATEST_CS_VERSION = 'LATEST_CS_VERSION'
 export const VUE_VERSION = 'VUE_VERSION'
 export const CUSTOM_COLUMNS = 'CUSTOM_COLUMNS'
 export const RELOAD_ALL_PROJECTS = 'RELOAD_ALL_PROJECTS'
+export const MS_ID = 'MS_ID'
 export const OAUTH_DOMAIN = 'OAUTH_DOMAIN'
 export const OAUTH_PROVIDER = 'OAUTH_PROVIDER'
 
diff --git a/ui/src/views/infra/Confirmation.vue b/ui/src/views/infra/Confirmation.vue
index 05246e364f9f..d596fdc87c0d 100644
--- a/ui/src/views/infra/Confirmation.vue
+++ b/ui/src/views/infra/Confirmation.vue
@@ -24,11 +24,6 @@
         :rules="rules"
         @finish="handleSubmit"
       >
-        <a-alert type="error">
-          <template #message>
-            <span v-html="$t(action.currentAction.message)" />
-          </template>
-        </a-alert>
         <a-form-item
           ref="algorithm"
           name="algorithm"
@@ -37,6 +32,7 @@
             <tooltip-label :title="$t('label.algorithm')" :tooltip="prepareForMaintenanceApiParams.algorithm.description"/>
           </template>
           <a-select
+            style="width: 500px"
             showSearch
             optionFilterProp="value"
             :filterOption="(input, option) => {
@@ -49,6 +45,12 @@
             </a-select-option>
           </a-select>
         </a-form-item>
+        <a-divider/>
+        <a-alert type="error">
+          <template #message>
+            <span v-html="$t(action.currentAction.message)" />
+          </template>
+        </a-alert>
         <a-alert type="warning" style="margin-top: 10px">
           <template #message>
             <span>{{ $t('message.confirm.type') }} "{{ action.currentAction.confirmationText }}"</span>