diff --git a/distfiles/admin.php b/distfiles/admin.php
index 25c8747..dd5959c 100644
--- a/distfiles/admin.php
+++ b/distfiles/admin.php
@@ -794,7 +794,7 @@ switch($table) {
             $shiftrow=mysqli_query($db,"select * from shifts");
             while ($shiftitem=mysqli_fetch_assoc($shiftrow)) {
                 if ($shiftitem["status"] == 1) {
-                    if ($shiftitem["shiftid"]==$customshiftnum) {
+                    if ($shiftitem["shiftid"]==$shift) {
                         printf("<option value=\"%s\" selected>%s</option>",$shiftitem["shiftid"],$shiftitem["shiftname"]); 
                     } else {
                         printf("<option value=\"%s\">%s</option>",$shiftitem["shiftid"],$shiftitem["shiftname"]);
@@ -830,7 +830,7 @@ switch($table) {
             } else {
                 $statdef="<img src=\"icons/cross.png\" title=\"inactive\" alt=\"inactive\">";
             }
-            $shiftname=dblookup($db,"shifts","shiftname","shiftid",$shift);
+            $shiftname=dblookup($db,"shifts","shiftid","shiftname",$tablerow["shift"]);
             printf("
             <tr>
             <td><a href=\"admin.php?table=$table&edit=1&id=%s\">%s</a></td>