diff --git a/html/includes/modal/new_bill.inc.php b/html/includes/modal/new_bill.inc.php
index 7cd4196016..29d9aee5dc 100644
--- a/html/includes/modal/new_bill.inc.php
+++ b/html/includes/modal/new_bill.inc.php
@@ -11,8 +11,16 @@
  * the source code distribution for details.
  */
 if(is_admin() !== false) {
+    
+    require 'includes/javascript-interfacepicker.inc.php';
+    
+    $port_device_id = -1;
     if (is_numeric($vars['port'])) {
         $port = dbFetchRow('SELECT * FROM `ports` AS P, `devices` AS D WHERE `port_id` = ? AND D.device_id = P.device_id', array($vars['port']));
+        $bill_data['bill_name']     = $port['port_descr_descr'];
+        $bill_data['bill_ref']      = $port['port_descr_circuit'];
+        $bill_data['bill_notes']    = $port['port_descr_speed'];
+        $port_device_id             = $port['device_id'];
     }
 ?>
 
@@ -27,34 +35,50 @@ if(is_admin() !== false) {
             <form method="post" role="form" action="bills/" class="form-horizontal alerts-form">
                 <input type="hidden" name="addbill" value="yes" />
 
+                <div class="form-group">
+                    <label class="col-sm-4 control-label" for="device">Device</label>
+                    <div class="col-sm-8">
+                        <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)">
+                            <option value=''>Select a device</option>
+                            <?php
+                              $devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
+                              foreach ($devices as $device) {
+                                  $selected = $device['device_id'] == $port_device_id ? " selected" : "";
+                                  echo "<option value='${device['device_id']}' $selected>${device['hostname']}</option>\n";
+                              }
+                              ?>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label" for="port_id">Port</label>
+                    <div class="col-sm-8">
+                        <select class="form-control input-sm" id="port_id" name="port_id">
+                        <?php if (is_array($port)) {
+                            // Need to pre-populate port as we've got a port pre-selected
+                            foreach (dbFetch('SELECT * FROM ports WHERE device_id = ?', array($port_device_id)) as $interface) {
+                                $interface  = ifNameDescr($interface);
+                                $string = $interface['label'].' - '.$interface['ifAlias'];
+                                $selected = $interface['port_id'] === $port['port_id'] ? " selected" : "";
+                                echo "<option value='${interface['port_id']}' $selected>$string</option>\n";
+                            }
+                        }   ?>
+                        </select>
+                    </div>
+                </div>                
+                
 <?php
-    if (is_array($port)) {
-        $portalias = (empty($port['ifAlias']) ? '' : ' - '.$port['ifAlias'].'');
-?>
-    <div class="well">
-        <input type="hidden" name="port" value="<?php echo $port['port_id'] ?>" />
-        <p>
-            <?php echo generate_device_link($port) ?>
-            <i class="fa fa-random"></i>
-            <?php echo generate_port_link($port, $port['ifName'] . $portalias) ?>
-        </p>
-    </div>
-<?php
-        $bill_data['bill_name'] = $port['port_descr_descr'];
-        $bill_data['bill_ref'] = $port['port_descr_circuit'];
-        $bill_data['bill_notes'] = $port['port_descr_speed'];
-    }
 
     $bill_data['bill_type'] = 'cdr';
     $quota = array('select_gb' => ' selected');
     $cdr = array('select_mbps' => ' selected');
     include 'pages/bill/addoreditbill.inc.php';
 ?>
-    <div class="form-group">
-      <div class="col-sm-offset-4 col-sm-4">
-        <button type="submit" class="btn btn-primary"><i class="fa fa-check"></i> Add Bill</button>
-      </div>
-    </div>
+                <div class="form-group">
+                  <div class="col-sm-offset-4 col-sm-4">
+                    <button type="submit" class="btn btn-primary"><i class="fa fa-check"></i> Add Bill</button>
+                  </div>
+                </div>
 
             </form>
         </div>
diff --git a/html/pages/bill/addoreditbill.inc.php b/html/pages/bill/addoreditbill.inc.php
index 75e64ff201..82ad7b96aa 100644
--- a/html/pages/bill/addoreditbill.inc.php
+++ b/html/pages/bill/addoreditbill.inc.php
@@ -1,3 +1,4 @@
+<h4>Bill Information</h4>
 <div class="form-group">
   <label for="bill_name" class="col-sm-4 control-label">Description</label>
   <div class="col-sm-8">
diff --git a/html/pages/bill/edit.inc.php b/html/pages/bill/edit.inc.php
index 9c5a84dcab..f4581bf5f4 100644
--- a/html/pages/bill/edit.inc.php
+++ b/html/pages/bill/edit.inc.php
@@ -150,16 +150,7 @@
                         <?php
                           $devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
                           foreach ($devices as $device) {
-                              unset($done);
-                              foreach ($access_list as $ac) {
-                                  if ($ac == $device['device_id']) {
-                                      $done = 1;
-                                  }
-                              }
-                          
-                              if (!$done) {
-                                  echo "          <option value='".$device['device_id']."'>".$device['hostname']."</option>\n";
-                              }
+                              echo "<option value='${device['device_id']}'>${device['hostname']}</option>\n";
                           }
                           
                           ?>
diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index be60dfef63..9bb0ca8672 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -75,8 +75,8 @@ if ($_POST['addbill'] == 'yes') {
 
     $bill_id = dbInsert($insert, 'bills');
 
-    if (is_numeric($bill_id) && is_numeric($_POST['port'])) {
-        dbInsert(array('bill_id' => $bill_id, 'port_id' => $_POST['port']), 'bill_ports');
+    if (is_numeric($bill_id) && is_numeric($_POST['port_id'])) {
+        dbInsert(array('bill_id' => $bill_id, 'port_id' => $_POST['port_id']), 'bill_ports');
     }
     
     header('Location: /' . generate_url(array('page' => 'bill', 'bill_id' => $bill_id, 'view' => 'edit')));