diff --git a/index.php b/index.php
index 88a687e..2f5f709 100644
--- a/index.php
+++ b/index.php
@@ -999,7 +999,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                   </div>
                 </td>
 <?php } else { ?>
-<?php if($isvendor===1 && $initialvendorformcomplete===1) { ?>
+<?php if($isvendor===1 && $initialvendorformcomplete===0) { echo ''; } else { ?>
                 <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">
@@ -1027,8 +1027,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     }
                   });
                   $('#id_type-<?php echo $visitid; ?>').trigger("change");
-                                  </script></td>
-<?php } ?>
+                                  </script>
 <?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>
@@ -1056,10 +1055,12 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     }
                   });
                   $('#citizen-<?php echo $visitid; ?>').trigger("change");
-                                  </script></td>
+                                  </script>
 <?php } ?>
+                                  <?php } ?>
+
                 <td class="small">
-<?php if($isvendor===1 && $initialvendorformcomplete===1) { ?>
+<?php if($isvendor===1 && $initialvendorformcomplete===0) { echo ''; } else { ?>
                   <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">
diff --git a/signin.php b/signin.php
index 98cf037..efa2b18 100644
--- a/signin.php
+++ b/signin.php
@@ -198,10 +198,10 @@ if(empty($form_data['fd_formAction'])){
         <div class="col d-grid gap-2">
           <input type="hidden" name="fd_formAction" id="fd_formAction" value="nameandcompany" />
           <input type="hidden" name="fd_siteId" id="fd_siteId" value="<?=$form_data['fd_siteId']?>" />
-          <button type="submit" id="fd_isVendor" class="btn btn-lg btn-outline-primary" name="fd_isVendor" value="0">&nbsp;<br><?=$transLang['CUSTOMER']?><br>&nbsp;</button>
+          <button type="submit" id="fd_isVendor" class="btn btn-lg btn-success" name="fd_isVendor" value="0">&nbsp;<br><?=$transLang['CUSTOMER']?><br>&nbsp;</button>
         </div>
         <div class="col d-grid gap-2">
-          <button type="submit" id="fd_isVendor" class="btn btn-lg btn-outline-primary" name="fd_isVendor" value="1">&nbsp;<br><?=$transLang['STR_VENDORINFO_VENDOR_TITLE']?><br>&nbsp;</button>
+          <button type="submit" id="fd_isVendor" class="btn btn-lg btn-primary" name="fd_isVendor" value="1">&nbsp;<br><?=$transLang['STR_VENDORINFO_VENDOR_TITLE']?><br>&nbsp;</button>
         </div>
       </div>
     </form>