Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp	(revision 91697)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp	(revision 91698)
@@ -311,5 +311,15 @@
 void UIWizardNewCloudVMPageExpert::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -317,5 +327,12 @@
 void UIWizardNewCloudVMPageExpert::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update source: */
+    sltHandleSourceTabBarChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -329,5 +346,9 @@
 void UIWizardNewCloudVMPageExpert::sltHandleSourceTabBarChange()
 {
-    updateSource();
+    /* Update source type: */
+    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
+    sltHandleSourceImageChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -335,41 +356,13 @@
 void UIWizardNewCloudVMPageExpert::sltHandleSourceImageChange()
 {
-    updateSourceImage();
-    emit completeChanged();
-}
-
-void UIWizardNewCloudVMPageExpert::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardNewCloudVMPageExpert::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    updateSource();
-}
-
-void UIWizardNewCloudVMPageExpert::updateSource()
-{
-    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
-    updateSourceImage();
-}
-
-void UIWizardNewCloudVMPageExpert::updateSourceImage()
-{
+    /* Update source image & VSD form: */
     m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
-    updateVSDForm();
-}
-
-void UIWizardNewCloudVMPageExpert::updateVSDForm()
-{
     wizard()->setVSD(createVirtualSystemDescription(wizard()));
     populateFormProperties(wizard()->vsd(), m_pSourceTabBar, m_strSourceImageId);
     wizard()->createVSDForm();
     updatePropertiesTable();
+
+    /* Notify about changes: */
+    emit completeChanged();
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h	(revision 91697)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h	(revision 91698)
@@ -76,14 +76,4 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source. */
-    void updateSource();
-    /** Updates source image. */
-    void updateSourceImage();
-    /** Updates VSD form. */
-    void updateVSDForm();
     /** Updates properties table. */
     void updatePropertiesTable();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp	(revision 91697)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp	(revision 91698)
@@ -530,5 +530,15 @@
 void UIWizardNewCloudVMPageSource::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -536,5 +546,12 @@
 void UIWizardNewCloudVMPageSource::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update source: */
+    sltHandleSourceTabBarChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -548,5 +565,9 @@
 void UIWizardNewCloudVMPageSource::sltHandleSourceTabBarChange()
 {
-    updateSource();
+    /* Update source type: */
+    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
+    sltHandleSourceImageChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -554,31 +575,8 @@
 void UIWizardNewCloudVMPageSource::sltHandleSourceImageChange()
 {
-    updateSourceImage();
+    /* Update source image: */
+    m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
+
+    /* Notify about changes: */
     emit completeChanged();
 }
-
-void UIWizardNewCloudVMPageSource::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardNewCloudVMPageSource::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    updateSource();
-}
-
-void UIWizardNewCloudVMPageSource::updateSource()
-{
-    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
-    updateSourceImage();
-}
-
-void UIWizardNewCloudVMPageSource::updateSourceImage()
-{
-    m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
-}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h	(revision 91697)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h	(revision 91698)
@@ -121,13 +121,4 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source. */
-    void updateSource();
-    /** Updates source image. */
-    void updateSourceImage();
-
     /** Holds the image ID. */
     QString  m_strSourceImageId;
