diff --git a/src/js/Alpaca.js b/src/js/Alpaca.js
index 156d561a0..161f13656 100644
--- a/src/js/Alpaca.js
+++ b/src/js/Alpaca.js
@@ -1182,8 +1182,8 @@
          */
         regexps:
         {
-            "email": /^([a-z0-9!\#\$%&'\*\-\/=\?\+\-\^_`\{\|\}~]+(?:\.[a-z0-9!\#\$%&'\*\-\/=\?\+\-\^_`\{\|\}~]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z]{2,6})?$/i,
-            "url": /^((http|https|ftp):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(\:[0-9]{1,5})?(\/.*)?)?$/i,
+            "email": /^([a-z0-9!\#\$%&'\*\-\/=\?\+\-\^_`\{\|\}~]+(?:\.[a-z0-9!\#\$%&'\*\-\/=\?\+\-\^_`\{\|\}~]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z]{2,63})?$/i,
+            "url": /^((http|https|ftp):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,63}(\:[0-9]{1,5})?(\/.*)?)?$/i,
             "intranet-url": /^((http|https|ftp):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\:[0-9]{1,5})?(\/.*)?)?$/i,
             "password": /^[0-9a-zA-Z\x20-\x7E]*$/,
             "date": /^((0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])[- /.]\d\d)?$/,