diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index 838fa3f..e3b6989 100755
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -307,9 +307,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
                 self.vm, 'template',
                 self.vm.app.default_template,
                 (lambda vm: vm.klass == 'TemplateVM'),
-                allow_default=False, allow_none=False,
-                transform=(lambda x: x if x != self.vm.app.default_template
-                           else x + self.tr(' (default)')))
+                allow_default=False, allow_none=False)
         else:
             self.template_name.setEnabled(False)
             self.template_idx = -1
@@ -631,7 +629,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
 
         try:
             if self.virt_mode.currentIndex() != self.virt_mode_idx:
-                self.vm.virt_mode = self.selected_virt_mode().lower()
+                self.vm.virt_mode = self.selected_virt_mode()
         except Exception as ex:  # pylint: disable=broad-except
             msg.append(str(ex))
 
diff --git a/qubesmanager/utils.py b/qubesmanager/utils.py
index 45de190..5b40f5f 100644
--- a/qubesmanager/utils.py
+++ b/qubesmanager/utils.py
@@ -60,6 +60,8 @@ def prepare_choice(widget, holder, propname, choice, default,
             oldvalue = qubesadmin.DEFAULT
         else:
             oldvalue = getattr(holder, propname)
+            if transform is not None and oldvalue is not None:
+                oldvalue = transform(oldvalue)
     else:
         oldvalue = object()  # won't match for identity
     idx = 0