Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 50309)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 50310)
@@ -198,5 +198,5 @@
     {
         QString strDefaultID = "WindowsXP";
-        if (ARCH_BITS == 64)
+        if (m_fSupportsHWVirtEx && m_fSupportsLongMode)
             strDefaultID += "_64";
         int iIndexWinXP = m_pTypeCombo->findData(strDefaultID, TypeID);
@@ -208,5 +208,5 @@
     {
         QString strDefaultID = "Ubuntu";
-        if (ARCH_BITS == 64)
+        if (m_fSupportsHWVirtEx && m_fSupportsLongMode)
             strDefaultID += "_64";
         int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 50309)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 50310)
@@ -33,7 +33,4 @@
 /* COM includes: */
 #include "CSystemProperties.h"
-
-/* Other VBox includes: */
-#include <iprt/system.h>
 
 /* Defines some patterns to guess the right OS type. Should be in sync with
@@ -163,4 +160,7 @@
     : m_strGroup(strGroup)
 {
+    CHost host = vboxGlobal().host();
+    m_fSupportsHWVirtEx = host.GetProcessorFeature(KProcessorFeature_HWVirtEx);
+    m_fSupportsLongMode = host.GetProcessorFeature(KProcessorFeature_LongMode);
 }
 
@@ -168,5 +168,5 @@
 {
     /* Do not forget about achitecture bits: */
-    strNewName += QString::number(ARCH_BITS);
+    strNewName += m_fSupportsHWVirtEx && m_fSupportsLongMode ? "64" : "32";
 
     /* Search for a matching OS type based on the string the user typed already. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 50309)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h	(revision 50310)
@@ -61,4 +61,6 @@
     /* Variables: */
     QString m_strGroup;
+    bool m_fSupportsHWVirtEx;
+    bool m_fSupportsLongMode;
 };