diff --git a/adama-core/src/main/java/com/adama/api/util/random/RandomUtil.java b/adama-core/src/main/java/com/adama/api/util/random/RandomUtil.java
index a748b87..c357a11 100644
--- a/adama-core/src/main/java/com/adama/api/util/random/RandomUtil.java
+++ b/adama-core/src/main/java/com/adama/api/util/random/RandomUtil.java
@@ -2,22 +2,33 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 
+import java.security.SecureRandom;
+
 /**
  * Utility class for generating random Strings.
  */
 public final class RandomUtil {
+	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
 	private static final int DEF_COUNT = 20;
 
+    static {
+        SECURE_RANDOM.nextBytes(new byte[64]);
+    }
+
 	private RandomUtil() {
 	}
 
+    private static String generateRandomAlphanumericString() {
+        return RandomStringUtils.random(DEF_COUNT, 0, 0, true, true, null, SECURE_RANDOM);
+    }
+
 	/**
 	 * Generates a password.
 	 *
 	 * @return the generated password
 	 */
 	public static String generatePassword() {
-		return RandomStringUtils.randomAlphanumeric(DEF_COUNT);
+		return generateRandomAlphanumericString();
 	}
 
 	/**
@@ -26,6 +37,6 @@ public static String generatePassword() {
 	 * @return the generated reset key
 	 */
 	public static String generateResetKey() {
-		return RandomStringUtils.randomNumeric(DEF_COUNT);
+		return generateRandomAlphanumericString();
 	}
 }