diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
index 31f3c81c..2d99d8b0 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
@@ -291,11 +291,14 @@ public class Utils {
 		return pattern.matcher(email).matches();
 	}
 
+//	public static String randomKey(Integer range) {
+//		String data = String.valueOf(System.currentTimeMillis());
+//		return data.substring(data.length() - range);
+//
+//	}
 	public static String randomKey(Integer range) {
-		String data = String.valueOf(System.currentTimeMillis());
-		return data.substring(data.length() - range);
+		return UUID.randomUUID().toString().replace("-", "").substring(0, range);
 	}
-
 	public static String convertObjectToJsonString(Object object) {
 		try {
 			// Check if the object is a string