diff --git a/node/db/PadManager.js b/node/db/PadManager.js
index 00128267..01ec5143 100644
--- a/node/db/PadManager.js
+++ b/node/db/PadManager.js
@@ -104,6 +104,6 @@ exports.doesPadExists = function(padId, callback)
 
 exports.isValidPadId = function(padId)
 {
-  return /^([0-9]+\$)?[^$]{1,50}$/.test(padId);
+  return /^(g.[a-zA-Z0-9]{16}\$)?[^$]{1,50}$/.test(padId);
 }