diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 27a77c3eb..dd0e50ece 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1269,7 +1269,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					break;
 				default:
 					if(!empty($value['addon']))
-						echo '<span class="input-append'.($value["type"]=='password' ? ' show-hide-password' : '').'">';
+						echo '<span class="input-append'.($value["type"]=='password' ? ' show-hide-password' : '').' '.substr(md5($value['addon']), 0, 6).'">';
 					echo '<input'.
 						(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
 						(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 8f32d9bf6..304cd5831 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -385,6 +385,21 @@ $(document).ready( function() {
 		}
 	}); /* }}} */
 
+	$('body').on('click', 'div.8cf73c span', function(ev) { /* {{{ */
+		ev.preventDefault();
+		closest = $(this).closest('div.8cf73c');
+		$.get(seeddms_webroot+'op/op.Ajax.php',
+			{ command: 'randomstring', len: 16 },
+			function(data) {
+				if(data.success) {
+					input = closest.children(":first");
+					input.val(data.string);
+				}
+			},
+			'json'
+		);
+	}); /* }}} */
+
 	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
 
 	initMost();
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 8d355c6ad..c841a5816 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1252,7 +1252,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					break;
 				default:
 					if(!empty($value['addon']))
-						echo '<div class="input-group date'.($value["type"]=='password' ? ' show-hide-password' : '').'">';
+						echo '<div class="input-group'.($value["type"]=='password' ? ' show-hide-password' : '').' '.substr(md5($value['addon']), 0, 6).'">';
 					echo '<input'.
 						(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
 						(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index e0eb3a029..b6d11d8d9 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -419,6 +419,21 @@ $(document).ready( function() {
 		}
 	}); /* }}} */
 
+	$('body').on('click', 'div.8cf73c span', function(ev) { /* {{{ */
+		ev.preventDefault();
+		closest = $(this).closest('div.8cf73c');
+		$.get(seeddms_webroot+'op/op.Ajax.php',
+			{ command: 'randomstring', len: 16 },
+			function(data) {
+				if(data.success) {
+					input = closest.children(":first");
+					input.val(data.string);
+				}
+			},
+			'json'
+		);
+	}); /* }}} */
+
 //	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
 
 	initMost();