diff --git a/order/complete_order.php b/order/complete_order.php
index e2ed8f581bce1546a23a4fe5b1f855cd83f2a505..766eb0b5aa8581d6f67126a10a046efe043edf0c 100644
--- a/order/complete_order.php
+++ b/order/complete_order.php
@@ -21,13 +21,15 @@
                     $username = $row['username'];
                     include("../template/header.php");
                 }
-                mysqli_close($con);
 
                 //==================================================
 
                 $ppoint = $_POST['picking_point'];
 				$dest = $_POST['destination'];
 				$seldrv = $_POST['selected_driver'];
+
+				$driverinfo_query = mysqli_query($con, "SELECT * FROM driver WHERE driver_id ='".$seldrv."'") or die(mysqli_error());
+				$driverinfo = mysqli_fetch_assoc($driverinfo_query);
             ?>
 		</div>
 		<div class="menu_container">
@@ -58,6 +60,7 @@
 				<input class="button green" type="submit" name="submit" value="Complete Order">
 			</div>
 		</form>
+		<?php mysqli_close($con); ?>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/order/select_driver.php b/order/select_driver.php
index 34cdd76accd01e9ba810e0ee7224f5a6aaa51f7c..b975c7684e0998e52d9b68fbb4b294b4b4747c96 100644
--- a/order/select_driver.php
+++ b/order/select_driver.php
@@ -48,7 +48,7 @@
 		                        		<td>
 					    					<p class='driver_username'>".$driver_name."</p>
 					    					<p class='driver_rating'>&starf;".$driver_rating." (".$driver_votes." votes)</p>
-					    					<div class='button green' onclick='chooseDriver()'>
+					    					<div class='button green' onclick='chooseDriver(".$driver_id.")'>
 					    						I CHOOSE YOU
 					    					</div>
 		                        		</td>