diff --git a/src/js/main.js b/src/js/main.js
index 09e3a30..6875fe4 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -532,13 +532,7 @@ $(function() {
   });
 
   function generatePassword() {
-    let length = 16;
-    const charset = "abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    let retVal = "";
-    for (var i = 0, n = charset.length; i < length; ++i) {
-        retVal += charset.charAt(Math.floor(Math.random() * n));
-    }
-    return retVal;
+    return uuid.v4();
   }
 
   $('.navbar-collapse ul li a').click(function() {
diff --git a/src/views/index.mustache b/src/views/index.mustache
index bd3a0b4..800ce37 100644
--- a/src/views/index.mustache
+++ b/src/views/index.mustache
@@ -186,12 +186,13 @@
   <script src="https://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/aes.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.5/clipboard.min.js"></script>
-  <script type="text/javascript" src="vendor/autolinker.min.js"></script>
-  <script type="text/javascript" src="vendor/underscore.min.js"></script>
-  <script type="text/javascript" src="vendor/modernizr-custom.min.js"></script>
-  <script type="text/javascript" src="vendor/autosize.min.js"></script>
-  <script type="text/javascript" src="vendor/bootstrap-switch.min.js"></script>
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
+  <script src="/vendor/uuid.js"></script>
+  <script src="/vendor/autolinker.min.js"></script>
+  <script src="/vendor/underscore.min.js"></script>
+  <script src="/vendor/modernizr-custom.min.js"></script>
+  <script src="/vendor/autosize.min.js"></script>
+  <script src="/vendor/bootstrap-switch.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
   <script src="/main.js"></script>
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){