diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index bf52d237..3f2f6cec 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -209,12 +209,17 @@
                             </div>
 
                             <div class="form-group">
-                                <label>IP</label>
+                                <label>IP Address or DHCP</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                    <input type="text" class="form-control" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="dhcp" value="1">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
 
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index 4f6b0294..5b017970 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -204,12 +204,17 @@
                             </div>
 
                             <div class="form-group">
-                                <label>IP</label>
+                                <label>IP Address or DHCP</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                    <input type="text" class="form-control" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="dhcp" value="1" <?php if($asset_ip == 'DHCP'){ echo "checked"; } ?>>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
 
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 421ca8d3..1c61e626 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -224,12 +224,17 @@
                             </div>
 
                             <div class="form-group">
-                                <label>IP</label>
+                                <label>IP Address or DHCP</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                                     </div>
-                                    <input type="text" class="form-control" name="ip" value="<?php echo $asset_ip; ?>" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                    <input type="text" class="form-control" name="ip" value="<?php echo $asset_ip; ?>" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="dhcp" value="1" <?php if($asset_ip == 'DHCP'){ echo "checked"; } ?>>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
 
diff --git a/post/asset.php b/post/asset.php
index 3acc09a8..e5298633 100644
--- a/post/asset.php
+++ b/post/asset.php
@@ -17,6 +17,9 @@ if (isset($_POST['add_asset'])) {
     $serial = sanitizeInput($_POST['serial']);
     $os = sanitizeInput($_POST['os']);
     $ip = sanitizeInput($_POST['ip']);
+    if($_POST['dhcp'] == 1){
+        $ip = 'DHCP';
+    }
     $mac = sanitizeInput($_POST['mac']);
     $uri = sanitizeInput($_POST['uri']);
     $status = sanitizeInput($_POST['status']);
@@ -89,6 +92,9 @@ if (isset($_POST['edit_asset'])) {
     $serial = sanitizeInput($_POST['serial']);
     $os = sanitizeInput($_POST['os']);
     $ip = sanitizeInput($_POST['ip']);
+    if($_POST['dhcp'] == 1){
+        $ip = 'DHCP';
+    }
     $mac = sanitizeInput($_POST['mac']);
     $uri = sanitizeInput($_POST['uri']);
     $status = sanitizeInput($_POST['status']);