diff --git a/agent/credentials.php b/agent/credentials.php
index 850606c6..3c726835 100644
--- a/agent/credentials.php
+++ b/agent/credentials.php
@@ -419,7 +419,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <div class="media">
                                             <i class="fa fa-fw fa-2x fa-key mr-3"></i>
                                             <div class="media-body">
-                                                <div><?php echo $credential_name; ?></div>
+                                                <div><?php echo $credential_name; ?> <?php if ($credential_favorite) { echo "<i class='fas fa-fw fa-star text-warning' title='Favorite'></i>"; } ?></div>
                                                 <div><small class="text-secondary"><?php echo $credential_description; ?></small></div>
                                                 <?php
                                                 if (!empty($credential_tags_display)) { ?>
diff --git a/agent/modals/credential/credential_add.php b/agent/modals/credential/credential_add.php
index 9815ba0f..46710e89 100644
--- a/agent/modals/credential/credential_add.php
+++ b/agent/modals/credential/credential_add.php
@@ -75,7 +75,9 @@ ob_start();
                         <input type="text" class="form-control" name="name" placeholder="Name of Login" maxlength="200" required autofocus>
                         <div class="input-group-append">
                             <div class="input-group-text">
-                                <input type="checkbox" name="important" value="1">
+                                <label class="star-toggle mb-0" title="Favorite">
+                                    <input type="checkbox" name="favorite" value="1"><i class="far fa-star"></i>
+                                </label>
                             </div>
                         </div>
                     </div>
diff --git a/agent/modals/credential/credential_edit.php b/agent/modals/credential/credential_edit.php
index 1388034a..98ce375b 100644
--- a/agent/modals/credential/credential_edit.php
+++ b/agent/modals/credential/credential_edit.php
@@ -20,7 +20,7 @@ $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']);
 $credential_note = nullable_htmlentities($row['credential_note']);
 $credential_created_at = nullable_htmlentities($row['credential_created_at']);
 $credential_archived_at = nullable_htmlentities($row['credential_archived_at']);
-$credential_important = intval($row['credential_important']);
+$credential_favorite = intval($row['credential_favorite']);
 $credential_contact_id = intval($row['credential_contact_id']);
 $credential_asset_id = intval($row['credential_asset_id']);
 
@@ -75,7 +75,13 @@ ob_start();
                         <input type="text" class="form-control" name="name" placeholder="Name of Credential" maxlength="200" value="<?php echo $credential_name; ?>" required>
                         <div class="input-group-append">
                             <div class="input-group-text">
-                                <input type="checkbox" name="important" value="1" <?php if ($credential_important == 1) { echo "checked"; } ?>>
+                                <label class="star-toggle mb-0" title="Favorite">
+                                    <input type="checkbox"
+                                            name="favorite"
+                                            value="1"
+                                            <?php if($credential_favorite) { echo 'checked'; } ?>>
+                                    <i class="far fa-star"></i>
+                                </label>
                             </div>
                         </div>
                     </div>
diff --git a/agent/post/credential.php b/agent/post/credential.php
index 723566f9..4c326e36 100644
--- a/agent/post/credential.php
+++ b/agent/post/credential.php
@@ -12,7 +12,7 @@ if (isset($_POST['add_credential'])) {
 
     require_once 'credential_model.php';
 
-    mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_important = $important, credential_contact_id = $contact_id, credential_asset_id = $asset_id, credential_client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_favorite = $favorite, credential_contact_id = $contact_id, credential_asset_id = $asset_id, credential_client_id = $client_id");
 
     $credential_id = mysqli_insert_id($mysqli);
 
@@ -49,7 +49,7 @@ if (isset($_POST['edit_credential'])) {
     }
 
     // Update the credential entry with the new details
-    mysqli_query($mysqli,"UPDATE credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_important = $important, credential_contact_id = $contact_id, credential_asset_id = $asset_id WHERE credential_id = $credential_id");
+    mysqli_query($mysqli,"UPDATE credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_favorite = $favorite, credential_contact_id = $contact_id, credential_asset_id = $asset_id WHERE credential_id = $credential_id");
 
     // Tags
     // Delete existing tags
diff --git a/agent/post/credential_model.php b/agent/post/credential_model.php
index 0d3818dd..e60bf01e 100644
--- a/agent/post/credential_model.php
+++ b/agent/post/credential_model.php
@@ -11,6 +11,6 @@ $username = encryptCredentialEntry(trim($_POST['username']));
 $password = encryptCredentialEntry(trim($_POST['password']));
 $otp_secret = sanitizeInput($_POST['otp_secret']);
 $note = sanitizeInput($_POST['note']);
-$important = intval($_POST['important'] ?? 0);
+$favorite = intval($_POST['favorite'] ?? 0);
 $contact_id = intval($_POST['contact'] ?? 0);
 $asset_id = intval($_POST['asset'] ?? 0);