diff --git a/ui/public/assets/bg-what-is-cloudstack.png b/ui/public/assets/bg-what-is-cloudstack.png
new file mode 100644
index 00000000000..db657dcf607
Binary files /dev/null and b/ui/public/assets/bg-what-is-cloudstack.png differ
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 669cef669cf..50b93f83b90 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -579,7 +579,7 @@
 "label.console.proxy": "Console proxy",
 "label.console.proxy.vm": "Console Proxy VM",
 "label.continue": "Continue",
-"label.continue.basic.install": "Continue with basic installation",
+"label.continue.install": "Continue with installation",
 "label.copied.clipboard": "Copied to clipboard",
 "label.copy": "Copy",
 "label.copy.clipboard": "Copy to clipboard",
@@ -1037,10 +1037,10 @@
 "label.installwizard.addsecondarystorageintro.subtitle": "What is secondary storage?",
 "label.installwizard.addsecondarystorageintro.title": "Let’s add secondary storage",
 "label.installwizard.addzoneintro.subtitle": "What is a zone?",
-"label.installwizard.addzoneintro.title": "Let’s add a zone",
+"label.installwizard.addzoneintro.title": "Let's add a zone",
 "label.installwizard.click.launch": "Click the launch button.",
-"label.installwizard.subtitle": "This tour will aid you in setting up your CloudStack&#8482 installation",
-"label.installwizard.title": "Hello and Welcome to CloudStack&#8482",
+"label.installwizard.subtitle": "This guide will aid you in setting up your CloudStack™ installation",
+"label.installwizard.title": "Hello and Welcome to CloudStack™",
 "label.instance": "Instance",
 "label.instance.groups": "Instance Groups",
 "label.instance.name": "Instance Name",
@@ -1062,7 +1062,7 @@
 "label.internallbvm": "InternalLbVm",
 "label.interval": "Polling Interval (in sec)",
 "label.intervaltype": "Interval Type",
-"label.introduction.to.cloudstack": "Introduction to CloudStack&#8482",
+"label.introduction.to.cloudstack": "Introduction to CloudStack™",
 "label.invalid.integer": "Invalid Integer",
 "label.invalid.number": "Invalid Number",
 "label.invitations": "Invitations",
@@ -2298,7 +2298,7 @@
 "label.weekly": "Weekly",
 "label.welcome": "Welcome",
 "label.welcome.cloud.console": "Welcome to Management Console",
-"label.what.is.cloudstack": "What is CloudStack&#8482?",
+"label.what.is.cloudstack": "What is CloudStack™?",
 "label.windows": "Windows",
 "label.write": "Write",
 "label.writeback": "Write-back disk caching",
@@ -2497,7 +2497,7 @@
 "message.basic.mode.desc": "Choose this network model if you do <b>*<u>not</u>*</b> want to enable any VLAN support.  All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.",
 "message.certificate.upload.processing": "Certificate upload in progress",
 "message.change.offering.confirm": "Please confirm that you wish to change the service offering of this virtual instance.",
-"message.change.password": "Please change your password.",
+"message.change.password": "Please change your password",
 "message.cluster.dedicated": "Cluster Dedicated",
 "message.cluster.dedication.released": "Cluster dedication released",
 "message.config.sticky.policy.failed": "Failed to configure sticky policy",
@@ -2823,12 +2823,12 @@
 "message.host.dedication.released": "Host dedication released",
 "message.info.cloudian.console": "Cloudian Management Console should open in another window",
 "message.installwizard.click.retry": "Click the button to retry launch.",
-"message.installwizard.copy.whatisacluster": "A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.",
-"message.installwizard.copy.whatisahost": "A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.",
-"message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.",
-"message.installwizard.copy.whatisazone": "A zone is the largest organizational unit within a CloudStack&#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).",
-"message.installwizard.copy.whatiscloudstack": "CloudStack&#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.",
-"message.installwizard.copy.whatisprimarystorage": "A CloudStack&#8482; cloud infrastructure makes use of two types of storage: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.",
+"message.installwizard.copy.whatisacluster": "A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack™; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.",
+"message.installwizard.copy.whatisahost": "A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack™; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.",
+"message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack™; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.",
+"message.installwizard.copy.whatisazone": "A zone is the largest organizational unit within a CloudStack™; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).",
+"message.installwizard.copy.whatiscloudstack": "CloudStack™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.\n\nExtending beyond individual virtual machine images running on commodity hardware, CloudStack™ provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features.",
+"message.installwizard.copy.whatisprimarystorage": "A CloudStack™; cloud infrastructure makes use of two types of storage: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts.",
 "message.installwizard.copy.whatissecondarystorage": "Secondary storage is associated with a zone, and it stores the following:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>",
 "message.installwizard.now.building": "Now building your cloud...",
 "message.installwizard.tooltip.addcluster.name": "A name for the cluster.  This can be text of your choosing and is not used by CloudStack.",
@@ -3006,7 +3006,7 @@
 "message.set.default.nic": "Please confirm that you would like to make this NIC the default for this VM.",
 "message.set.default.nic.manual": "Please manually update the default NIC on the VM now.",
 "message.setting.updated": "Setting Updated:",
-"message.setup.physical.network.during.zone.creation": "When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined. Add or remove one or more traffic types onto each physical network.",
+"message.setup.physical.network.during.zone.creation": "When adding a zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined. Add or remove one or more traffic types onto each physical network.",
 "message.setup.physical.network.during.zone.creation.basic": "When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>add</strong> other traffic types onto the physical network.",
 "message.setup.successful": "Cloud setup successful!",
 "message.specifiy.tag.key": "Please specify a tag key",
diff --git a/ui/src/views/dashboard/Dashboard.vue b/ui/src/views/dashboard/Dashboard.vue
index 8f86c6721d8..946a1cc926f 100644
--- a/ui/src/views/dashboard/Dashboard.vue
+++ b/ui/src/views/dashboard/Dashboard.vue
@@ -17,7 +17,10 @@
 
 <template>
   <div class="page-header-index-wide">
-    <div v-if="$store.getters.userInfo.roletype === 'Admin' && !project">
+    <div v-if="showOnboarding">
+      <onboarding-dashboard />
+    </div>
+    <div v-else-if="$store.getters.userInfo.roletype === 'Admin' && !project">
       <capacity-dashboard/>
     </div>
     <div v-else>
@@ -27,23 +30,33 @@
 </template>
 
 <script>
+import { api } from '@/api'
 import store from '@/store'
 import CapacityDashboard from './CapacityDashboard'
 import UsageDashboard from './UsageDashboard'
+import OnboardingDashboard from './OnboardingDashboard'
 
 export default {
   name: 'Dashboard',
   components: {
     CapacityDashboard,
-    UsageDashboard
+    UsageDashboard,
+    OnboardingDashboard
+  },
+  provide: function () {
+    return {
+      parentFetchData: this.fetchData
+    }
   },
   data () {
     return {
       showCapacityDashboard: false,
-      project: false
+      project: false,
+      showOnboarding: false
     }
   },
   mounted () {
+    this.fetchData()
     this.showCapacityDashboard = Object.prototype.hasOwnProperty.call(store.getters.apis, 'listCapacity')
     this.project = false
     if (store.getters.project && store.getters.project.id) {
@@ -59,6 +72,16 @@ export default {
         }
       }
     )
+  },
+  methods: {
+    fetchData () {
+      if (!['Admin'].includes(this.$store.getters.userInfo.roletype)) {
+        return
+      }
+      api('listZones').then(json => {
+        this.showOnboarding = json.listzonesresponse.count ? json.listzonesresponse.count === 0 : true
+      })
+    }
   }
 }
 </script>
diff --git a/ui/src/views/dashboard/OnboardingDashboard.vue b/ui/src/views/dashboard/OnboardingDashboard.vue
new file mode 100644
index 00000000000..1cd2f58009b
--- /dev/null
+++ b/ui/src/views/dashboard/OnboardingDashboard.vue
@@ -0,0 +1,149 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <div class="onboarding">
+    <div class="head">
+      <h2>{{ $t('label.installwizard.title') }}</h2>
+      <h3>{{ $t('label.installwizard.subtitle') }}</h3>
+    </div>
+    <div class="body">
+      <div class="intro">
+        <div class="title">{{ $t('label.what.is.cloudstack') }}</div>
+        <div class="subtitle">{{ $t('label.introduction.to.cloudstack') }}</div>
+        <p>{{ $t('message.installwizard.copy.whatiscloudstack') }}</p>
+        <img class="center" src="assets/bg-what-is-cloudstack.png">
+        <a-button @click="() => { this.step = 1 }" type="primary">
+          {{ $t('label.continue.install') }}
+          <a-icon type="double-right"/>
+        </a-button>
+      </div>
+    </div>
+    <a-modal
+      :title="$t('message.change.password')"
+      :visible="this.step === 1"
+      :closable="true"
+      :footer="null"
+      @cancel="closeAction"
+      centered
+      width="auto">
+      <change-user-password
+        :resource="this.resource"
+        @close-action="() => { if (this.step !== 2) this.step = 0 }"
+        @refresh-data="() => { this.step = 2 }" />
+    </a-modal>
+    <a-modal
+      :title="$t('label.installwizard.addzoneintro.title')"
+      :visible="this.step === 2"
+      :closable="true"
+      :footer="null"
+      @cancel="closeAction"
+      centered
+      width="auto">
+      <zone-wizard
+        @close-action="closeAction"
+        @refresh-data="parentFetchData" />
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import ChangeUserPassword from '@/views/iam/ChangeUserPassword.vue'
+import ZoneWizard from '@/views/infra/zone/ZoneWizard.vue'
+
+export default {
+  name: 'OnboardingDashboard',
+  components: {
+    ChangeUserPassword,
+    ZoneWizard
+  },
+  inject: ['parentFetchData'],
+  data () {
+    return {
+      step: 0,
+      resource: {
+        id: this.$store.getters.userInfo.id,
+        username: this.$store.getters.userInfo.username
+      }
+    }
+  },
+  methods: {
+    closeAction () {
+      this.step = 0
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.onboarding {
+  font-family: sans-serif;
+  padding: 20px 10px 50px 10px;
+  background: #fff;
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  @media (min-width: 760px) {
+    padding: 20px 10% 50px 10%;
+  }
+}
+
+.head {
+  text-align: center;
+}
+
+h2 {
+  font-size: 28px;
+}
+
+h3 {
+  font-size: 20px;
+}
+
+.body {
+  padding: 56px 20px 20px 20px;
+}
+
+.title {
+  margin: auto auto 30px;
+  font-size: 22px;
+}
+
+.subtitle {
+  font-size: 12px;
+  font-weight: bold;
+}
+
+p {
+  font-family: sans-serif;
+  text-align: justify;
+  font-size: 15px;
+  line-height: 23px;
+  white-space: pre-line;
+}
+
+.center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 10px;
+  text-align: center;
+}
+
+button {
+  float: right;
+}
+</style>
diff --git a/ui/src/views/iam/ChangeUserPassword.vue b/ui/src/views/iam/ChangeUserPassword.vue
index 0f7247d9151..5ca9133e101 100644
--- a/ui/src/views/iam/ChangeUserPassword.vue
+++ b/ui/src/views/iam/ChangeUserPassword.vue
@@ -33,11 +33,11 @@
             v-decorator="['currentpassword', {
               rules: [{ required: true, message: $t('message.error.current.password') }]
             }]"
-            :placeholder="apiParams.currentpassword.description"/>
+            :placeholder="message.error.current.password"/>
         </a-form-item>
         <a-form-item>
           <span slot="label">
-            {{ $t('label.password') }}
+            {{ $t('label.new.password') }}
             <a-tooltip :title="apiParams.password.description">
               <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
             </a-tooltip>
@@ -46,7 +46,7 @@
             v-decorator="['password', {
               rules: [{ required: true, message: $t('message.error.new.password') }]
             }]"
-            :placeholder="apiParams.password.description"/>
+            :placeholder="$t('label.new.password')"/>
         </a-form-item>
         <a-form-item>
           <span slot="label">
@@ -67,7 +67,7 @@
                 }
               ]
             }]"
-            :placeholder="apiParams.password.description"/>
+            :placeholder="$t('label.confirmpassword.description')"/>
         </a-form-item>
 
         <div :span="24" class="action-button">
@@ -140,7 +140,7 @@ export default {
         if (this.isValidValueForKey(values, 'currentpassword') && values.currentpassword.length > 0) {
           params.currentpassword = values.currentpassword
         }
-        api('updateUser', params).then(json => {
+        api('updateUser', {}, 'POST', params).then(json => {
           this.$notification.success({
             message: this.$t('label.action.change.password'),
             description: `${this.$t('message.success.change.password')} ${this.resource.username}`
diff --git a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
index 52a29516f9d..913b8faf81c 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
@@ -32,7 +32,11 @@
           }]">
           <a-card :gutter="12" class="card-item">
             <a-col :md="6" :lg="6">
-              <a-radio class="card-form-item" value="Advanced">{{ $t('label.advanced') }}</a-radio>
+              <a-radio style="display: none;" class="card-form-item" value="Advanced">{{ $t('label.advanced') }}</a-radio>
+              <span style="margin-top: 20px" class="card-form-item">
+                <a-icon type="setting" style="margin-right: 10px" />
+                {{ $t('label.advanced') }}
+              </span>
             </a-col>
             <a-col :md="18" :lg="18">
               <a-card class="ant-form-text zone-support">{{ $t(zoneDescription.Advanced) }}</a-card>