diff --git a/index.php b/index.php
index 7b009aa..88a687e 100644
--- a/index.php
+++ b/index.php
@@ -986,7 +986,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
 <?php } ?>
                 <td class="small">
                   <div class="input-group input-group-sm mb-0 d-grid gap-2">
-                    <button type="submit" name="endvisit" value="<?php echo $visitid; ?>" class="btn btn-warning btn-block btn-sm <?php if ($isvendor===1 && $finalvendorformcomplete===0) { echo "disabled"; } ?>"><i class="fas fa-sign-out-alt"></i>&nbsp<?php echo $transLang['SIGNOUT']; ?></button>
+                      <button type="submit" name="endvisit" value="<?php echo $visitid; ?>" class="btn btn-warning btn-block btn-sm <?php if ($isvendor===1 && $finalvendorformcomplete===0) { echo "disabled"; } ?>"><i class="fas fa-sign-out-alt"></i>&nbsp<?php echo $transLang['SIGNOUT']; ?></button>
                   </div>
                   <div class="input-group input-group-sm mb-0">
                     <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $visitid; ?>"><i class="fas fa-clock"></i></span>
@@ -999,6 +999,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                   </div>
                 </td>
 <?php } else { ?>
+<?php if($isvendor===1 && $initialvendorformcomplete===1) { ?>
                 <div class="input-group input-group-sm mb-0">
                   <span class="input-group-text"><?php echo $transLang['ID_TYPE']; ?></span>
                   <select class="form-control form-control-sm bg-white form-select<?php if( isset($id_type_error) && $id_type_error===1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" id="id_type-<?php echo $visitid; ?>" name="id_type">
@@ -1026,7 +1027,8 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     }
                   });
                   $('#id_type-<?php echo $visitid; ?>').trigger("change");
-                </script>
+                                  </script></td>
+<?php } ?>
 <?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
                 <div class="input-group input-group-sm mb-0">
                   <span class="input-group-text"><?php echo $transLang['COUNTRY']; ?></span>
@@ -1054,14 +1056,16 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     }
                   });
                   $('#citizen-<?php echo $visitid; ?>').trigger("change");
-                </script>
+                                  </script></td>
 <?php } ?>
                 <td class="small">
+<?php if($isvendor===1 && $initialvendorformcomplete===1) { ?>
                   <div class="input-group input-group-sm mb-0">
                     <span class="input-group-text"><?php echo $transLang['BADGE']; ?></span>
                     <input type="text" id="badge" name="badge" class="form-control form-control-sm bg-white<?php if( isset($badge_error) && $badge_error===1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" autofocus maxlength="15">
                     <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
                   </div>
+<?php } ?>
 <?php if($isvendor===1) { ?>
                   <div class="input-group input-group-sm mb-0">
 <?php if(empty($initialvendorformcomplete)) {$initialvendorformcomplete=0;}; if ($initialvendorformcomplete===1) { ?>