diff --git a/common/script/libs/uuid.js b/common/script/libs/uuid.js
index 4a26440d7d..ca20dcec4e 100644
--- a/common/script/libs/uuid.js
+++ b/common/script/libs/uuid.js
@@ -1,9 +1 @@
-// TODO use node-uuid module
-module.exports = function() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    var r, v;
-    r = Math.random() * 16 | 0;
-    v = (c === "x" ? r : r & 0x3 | 0x8);
-    return v.toString(16);
-  });
-};
+module.exports = require('uuid').v4;
diff --git a/package.json b/package.json
index dd9f2ba866..931b624c0b 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
     "newrelic": "~1.26.1",
+    "uuid": "^2.0.1",
     "nib": "~1.0.1",
     "nodemailer": "^1.9.0",
     "pageres": "^4.1.1",
@@ -142,7 +143,6 @@
     "sinon": "^1.17.2",
     "sinon-chai": "^2.8.0",
     "superagent-defaults": "^0.1.13",
-    "uuid": "^2.0.1",
     "vinyl-source-stream": "^1.0.0",
     "vinyl-transform": "^1.0.0"
   }