diff --git a/client_software.php b/client_software.php
index bb359755..fc1606a4 100644
--- a/client_software.php
+++ b/client_software.php
@@ -9,7 +9,8 @@ if(!empty($_GET['sb'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM software LEFT JOIN logins ON login_software_id = software_id
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM software 
+  LEFT JOIN logins ON login_software_id = software_id
   WHERE software_client_id = $client_id 
   AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
@@ -76,6 +77,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $software_expire = $row['software_expire'];
             $software_notes = $row['software_notes'];
 
+            // Get Login
+            $login_id = $row['login_id'];
+            $login_username = $row['login_username'];
+            $login_password = decryptLoginEntry($row['login_password']);
+
             $seat_count = 0;
 
             // Asset Licenses
@@ -96,10 +102,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }
             $contact_licenses = implode(',',$contact_licenses_array);
 
-            // Get Login
-            $login_id = $row['login_id'];
-            $login_username = $row['login_username'];
-            $login_password = decryptLoginEntry($row['login_password']);
+            
 
           ?>
           <tr>