diff --git a/instances/templates/instances/settings_tab.html b/instances/templates/instances/settings_tab.html
index 6426023..0728664 100644
--- a/instances/templates/instances/settings_tab.html
+++ b/instances/templates/instances/settings_tab.html
@@ -886,15 +886,15 @@
                     <label for="vcpu_hotplug" class="col-sm-3 col-form-label">{% trans "vCPU Hot Plug" %}</label>
                     <div class="col-sm-6">
                         <div class="input-group">
-                        <select id="vcpu_hotplug" class="form-control" name="vcpu_hotplug">
-                            <option value="True" {% if instance.vcpus %} selected {% endif %}>{% trans 'Enabled' %}</option>
-                            <option value="False" {% if not instance.vcpus %} selected {% endif %}>{% trans 'Disabled' %}</option>
-                        </select>
-                        {% if instance.status == 5 %}
+                            <select id="vcpu_hotplug" class="form-control" name="vcpu_hotplug">
+                                <option value="True" {% if instance.vcpus %} selected {% endif %}>{% trans 'Enabled' %}</option>
+                                <option value="False" {% if not instance.vcpus %} selected {% endif %}>{% trans 'Disabled' %}</option>
+                            </select>
+                            {% if instance.status == 5 %}
                             <button type="submit" class="btn btn-success" name="set_vcpu_hotplug">{% trans "Set" %}</button>
-                        {% else %}
+                            {% else %}
                             <button class="btn btn-success" name="set_vcpu_hotplug" disabled>{% trans "Set" %}</button>
-                        {% endif %}
+                            {% endif %}
                         </div>
                     </div>
                 </div>
diff --git a/instances/views.py b/instances/views.py
index f8bcd2e..5cad4c6 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -793,9 +793,9 @@ def set_vcpu(request, pk):
 @superuser_only
 def set_vcpu_hotplug(request, pk):
     instance = get_instance(request.user, pk)
-    status = request.POST.get("vcpu_hotplug", "")
+    status = True if request.POST.get("vcpu_hotplug", "False") == 'True' else False
     msg = _("VCPU Hot-plug is enabled=%(status)s") % {"status": status}
-    instance.proxy.set_vcpu_hotplug(eval(status))
+    instance.proxy.set_vcpu_hotplug(status)
     addlogmsg(request.user.username, instance.compute.name, instance.name, msg)
     return redirect(request.META.get("HTTP_REFERER") + "#resize")