diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index bc81d175..74e7abe6 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -30,12 +30,17 @@
             <div class="tab-pane fade show active" id="pills-details">
 
               <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong></label>
+                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                   </div>
                   <input type="text" class="form-control" name="name" placeholder="Name of Login" required autofocus>
+                  <div class="input-group-append">
+                    <div class="input-group-text">
+                      <input type="checkbox" name="important" value="1">
+                    </div>
+                  </div>
                 </div>
               </div>
             
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 33a4a1d1..86108f55 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -30,12 +30,17 @@
             <div class="tab-pane fade show active" id="pills-details<?php echo $login_id; ?>">
 
               <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong></label>
+                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                   </div>
                   <input type="text" class="form-control" name="name" placeholder="Name of Login" value="<?php echo $login_name; ?>" required>
+                  <div class="input-group-append">
+                    <div class="input-group-text">
+                      <input type="checkbox" name="important" value="1" <?php if ($login_important == 1) { echo "checked"; } ?>>
+                    </div>
+                  </div>
                 </div>
               </div>
             
@@ -82,11 +87,12 @@
                 <label>URL/Host</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <a href="<?php echo $login_uri; ?>" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                   </div>
                   <input type="text" class="form-control" name="uri" placeholder="ex. google.com" value="<?php echo $login_uri; ?>">
                   <div class="input-group-append">
-                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                    
+                    <a href="<?php echo $login_uri; ?>" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
                   </div>
                   <div class="input-group-append">
                     <button class="input-group-text clipboardjs" type="button" data-clipboard-text="<?php echo $login_uri; ?>"><i class="fa fa-fw fa-copy"></i></button>
diff --git a/client_logins.php b/client_logins.php
index 92607353..b090e710 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -90,6 +90,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               $otp_display = "<span onmouseenter='showOTP($login_id_with_secret)'><i class='far fa-clock'></i> <span id='otp_$login_id'><i>Hover..</i></span></span>";
             }
             $login_note = htmlentities($row['login_note']);
+            $login_important = $row['login_important'];
             $login_contact_id = $row['login_contact_id'];
             $login_vendor_id = $row['login_vendor_id'];
             $login_asset_id = $row['login_asset_id'];
diff --git a/post.php b/post.php
index 34abe8df..083f2b9a 100644
--- a/post.php
+++ b/post.php
@@ -5679,12 +5679,13 @@ if(isset($_POST['add_login'])){
     $password = trim(mysqli_real_escape_string($mysqli,encryptLoginEntry($_POST['password'])));
     $otp_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['otp_secret'])));
     $note = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['note'])));
+    $important = intval($_POST['important']);
     $contact_id = intval($_POST['contact']);
     $vendor_id = intval($_POST['vendor']);
     $asset_id = intval($_POST['asset']);
     $software_id = intval($_POST['software']);
 
-    mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_uri = '$uri', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_uri = '$uri', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Login', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
@@ -5706,12 +5707,13 @@ if(isset($_POST['edit_login'])){
     $password = trim(mysqli_real_escape_string($mysqli,encryptLoginEntry($_POST['password'])));
     $otp_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['otp_secret'])));
     $note = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['note'])));
+    $important = intval($_POST['important']);
     $contact_id = intval($_POST['contact']);
     $vendor_id = intval($_POST['vendor']);
     $asset_id = intval($_POST['asset']);
     $software_id = intval($_POST['software']);
 
-    mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_uri = '$uri', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id WHERE login_id = $login_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_uri = '$uri', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id WHERE login_id = $login_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Login', log_action = 'Modify', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");