diff --git a/source/packages/com_mokosuiteclient/admin/src/Helper/SupportPinHelper.php b/source/packages/com_mokosuiteclient/admin/src/Helper/SupportPinHelper.php
index cb778d82..09555ca8 100644
--- a/source/packages/com_mokosuiteclient/admin/src/Helper/SupportPinHelper.php
+++ b/source/packages/com_mokosuiteclient/admin/src/Helper/SupportPinHelper.php
@@ -150,7 +150,7 @@ class SupportPinHelper
 			else
 			{
 				$html .= '<span class="badge bg-dark mokosuiteclient-pin-copy" style="font-family:monospace;letter-spacing:0.08em;cursor:pointer;" title="Click to copy" data-pin="' . $escaped . '">';
-				$html .= '<span class="icon-key small me-1" aria-hidden="true"></span>' . $escaped . '</span>';
+				$html .= '<span class="icon-key small me-1" aria-hidden="true"></span><span class="mokosuiteclient-pin-text">' . $escaped . '</span></span>';
 			}
 		}
 		else
@@ -193,7 +193,7 @@ document.addEventListener('DOMContentLoaded', function() {
 					if (textEl) {
 						var orig = textEl.textContent;
 						textEl.textContent = 'Copied!';
-						setTimeout(function() { textEl.textContent = orig; }, 1500);
+						setTimeout(function() { textEl.textContent = orig; }, 30000);
 					} else {
 						Joomla.renderMessages({message: ['PIN copied: ' + pin]});
 					}
@@ -225,14 +225,14 @@ document.addEventListener('DOMContentLoaded', function() {
 						} else {
 							btn.className = 'badge bg-dark mokosuiteclient-pin-copy';
 							btn.style = 'font-family:monospace;letter-spacing:0.08em;cursor:pointer;';
-							btn.innerHTML = '<span class="icon-key small me-1" aria-hidden="true"></span>' + data.pin;
+							btn.innerHTML = '<span class="icon-key small me-1" aria-hidden="true"></span><span class="mokosuiteclient-pin-text">' + data.pin + '</span>';
 						}
 						btn.addEventListener('click', function(ev) {
 							ev.preventDefault();
 							ev.stopPropagation();
 							navigator.clipboard.writeText(data.pin).then(function() {
 								var t = btn.querySelector('.mokosuiteclient-pin-text');
-								if (t) { var o = t.textContent; t.textContent = 'Copied!'; setTimeout(function() { t.textContent = o; }, 1500); }
+								if (t) { var o = t.textContent; t.textContent = 'Copied!'; setTimeout(function() { t.textContent = o; }, 30000); }
 								else { Joomla.renderMessages({message: ['PIN copied: ' + data.pin]}); }
 							});
 						});