diff --git a/assignnodetoasset.php b/assignnodetoasset.php
index 337210d..3db846f 100644
--- a/assignnodetoasset.php
+++ b/assignnodetoasset.php
@@ -17,6 +17,7 @@ include("header.php");
 
 $smarty->assign("node_ip", $node_ip);
 $smarty->assign("asset_id", $asset_id);
+$smarty->assign("subnet_id", $subnet_id);
 
 $query = "SELECT
 		asset_id,
diff --git a/nodeadd.php b/nodeadd.php
index 31791ad..1790800 100644
--- a/nodeadd.php
+++ b/nodeadd.php
@@ -17,6 +17,7 @@ include("header.php");
 $smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
 $smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
 $smarty->assign("node_ip", $node_ip);
+$smarty->assign("subnet_id", $subnet_id);
 	
 $smarty->assign("subnet_options", $db->options_subnet());
 $smarty->assign("assetclass_options", $db->options_assetclass());
diff --git a/tpl/assignnodetoasset.tpl b/tpl/assignnodetoasset.tpl
index b4be354..709f00f 100644
--- a/tpl/assignnodetoasset.tpl
+++ b/tpl/assignnodetoasset.tpl
@@ -97,7 +97,7 @@
         {$lang_subnet_subnetaddress}/{$lang_subnet_mask}
     </td>
     <td class="value">
-        {html_options name=subnet_id options=$subnet_options}
+        {html_options name=subnet_id options=$subnet_options selected=$subnet_id}
     </td>
 </tr>
 </table>
diff --git a/tpl/nodeadd.tpl b/tpl/nodeadd.tpl
index 90a5d5b..74c80be 100644
--- a/tpl/nodeadd.tpl
+++ b/tpl/nodeadd.tpl
@@ -125,7 +125,7 @@
             {$lang_subnet_subnetaddress}/{$lang_subnet_mask}
         </td>
         <td class="value">
-            {html_options name=subnet_id options=$subnet_options}
+            {html_options name=subnet_id options=$subnet_options selected=$subnet_id}
         </td>
     </tr>
 </table>