diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 2c015606757..314d7473e68 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -1934,6 +1934,8 @@
 "label.shrinkok": "Shrink OK",
 "label.shutdown.provider": "Shutdown provider",
 "label.simplified.chinese.keyboard": "Simplified Chinese keyboard",
+"label.s2scustomergatewayid": "Site to Site customer gateway ID",
+"label.s2svpngatewayid": "Site to Site VPN gateway ID",
 "label.site.to.site.vpn": "Site-to-site VPN",
 "label.site.to.site.vpn.connections": "Site-to-site VPN Connections",
 "label.size": "Size",
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index fa7e95ab274..c9b3a820690 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -996,7 +996,7 @@ export default {
         }
 
         const resourceName = params.displayname || params.displaytext || params.name || params.hostname || params.username ||
-          params.ipaddress || params.virtualmachinename || this.resource.name || this.resource.ipaddress
+          params.ipaddress || params.virtualmachinename || this.resource.name || this.resource.ipaddress || this.resource.id
 
         var hasJobId = false
         this.actionLoading = true
diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue
index dc74d68d42e..8229abedddb 100644
--- a/ui/src/views/infra/AddPrimaryStorage.vue
+++ b/ui/src/views/infra/AddPrimaryStorage.vue
@@ -593,8 +593,8 @@ export default {
         } else if (values.protocol === 'SMB') {
           url = this.smbURL(server, path)
           const smbParams = {
-            user: values.smbUsername,
-            password: values.smbPassword,
+            user: encodeURIComponent(values.smbUsername),
+            password: encodeURIComponent(values.smbPassword),
             domain: values.smbDomain
           }
           Object.keys(smbParams).forEach((key, index) => {
@@ -669,7 +669,7 @@ export default {
           params.tags = this.selectedTags.join()
         }
         this.loading = true
-        api('createStoragePool', params).then(json => {
+        api('createStoragePool', {}, 'POST', params).then(json => {
           this.$notification.success({
             message: this.$t('label.add.primary.storage'),
             description: this.$t('label.add.primary.storage')