diff --git a/module/zanode/config.php b/module/zanode/config.php
index 5ccfd5f8c7..3fc0ea0fc9 100644
--- a/module/zanode/config.php
+++ b/module/zanode/config.php
@@ -3,7 +3,7 @@ $config->zanode->create         = new stdClass();
 $config->zanode->edit           = new stdClass();
 $config->zanode->createimage    = new stdClass();
 $config->zanode->create->requiredFields        = 'name,host,image,cpu,memory,disk,osName';
-$config->zanode->create->physicsRequiredFields = 'name,extranet,cpu,memory,osNamePhysics';
+$config->zanode->create->physicsRequiredFields = 'name,extranet,osNamePhysics';
 $config->zanode->edit->requiredFields          = '';
 $config->zanode->createimage->requiredFields   = 'name';
 
diff --git a/module/zanode/js/create.ui.js b/module/zanode/js/create.ui.js
index fe8e1539c8..62988f206a 100644
--- a/module/zanode/js/create.ui.js
+++ b/module/zanode/js/create.ui.js
@@ -10,6 +10,9 @@ function onChangeType()
     {
         $("[name^='parent']").closest('.form-row').hide();
         $("[name^='image']").closest('.form-group').hide();
+        $("[name='cpuCores']").closest('.form-group').hide();
+        $("[name='memory']").closest('.form-row').hide();
+        $("[name='diskSize']").closest('.form-row').hide();
         $('#extranet').closest('.form-row').removeClass('hidden');
         $('#osName').closest('.form-row').addClass('hidden');
         $('#osNamePhysicsContainer').removeClass('hidden');
diff --git a/module/zanode/ui/edit.html.php b/module/zanode/ui/edit.html.php
index 2e7e4329c6..9f0b4de171 100644
--- a/module/zanode/ui/edit.html.php
+++ b/module/zanode/ui/edit.html.php
@@ -62,7 +62,7 @@ formPanel
         set::width('1/2'),
         set::value($zanode->extranet)
     ),
-    $hiddenHost ? array(formHidden('cpuCores', 0), formHidden('memory', 0), formHidden('diskSize', 0)) : array
+    $hiddenHost || $zanode->hostType == 'physics' ? array(formHidden('cpuCores', 0), formHidden('memory', 0), formHidden('diskSize', 0)) : array
     (
         formGroup
         (
diff --git a/module/zanode/zen.php b/module/zanode/zen.php
index 4332dc884c..016c9e0665 100644
--- a/module/zanode/zen.php
+++ b/module/zanode/zen.php
@@ -60,9 +60,8 @@ class zanodeZen extends zanode
     {
         if($this->post->hostType == 'physics') $this->config->zanode->create->requiredFields = $this->config->zanode->create->physicsRequiredFields;
 
-        if($this->loadModel('zahost')->hiddenHost())
+        if($this->loadModel('zahost')->hiddenHost() || $this->post->hostType == 'physics')
         {
-            $this->config->zanode->create->requiredFields = str_replace("cpu,memory,", '', $this->config->zanode->create->requiredFields);
             $this->config->zanode->form->create['memory']['required']   = false;
             $this->config->zanode->form->create['diskSize']['required'] = false;
         }