--- a/src/browser/sat_browser/register.py	Fri Jan 15 12:30:21 2016 +0100
+++ b/src/browser/sat_browser/register.py	Fri Jan 15 16:33:08 2016 +0100
@@ -40,7 +40,7 @@
 from pyjamas.ui.KeyboardListener import KEY_ENTER
 from pyjamas.Timer import Timer
 
-import re
+from __pyjamas__ import JS
 
 from constants import Const as C
 
@@ -178,7 +178,7 @@
         pass
 
     def onLogin(self, button):
-        if not re.match(r'^[a-z0-9_-]+(@[a-z0-9_-]+\.[a-z0-9_-]+)?$', self.login_box.getText(), re.IGNORECASE):
+        if not self.checkJID(self.login_box.getText()):
             self.login_warning_msg.setHTML('Invalid login, valid characters<br>are a-z A-Z 0-9 _ - or a bare JID')
         else:
             self.submit_type.setValue('login')
@@ -187,9 +187,9 @@
     def onRegister(self, button):
         # XXX: for now libervia forces the creation to lower case
         self.register_login_box.setText(self.register_login_box.getText().lower())
-        if not re.match(r'^[a-z0-9_-]+$', self.register_login_box.getText(), re.IGNORECASE):
+        if not self.checkLogin(self.register_login_box.getText()):
             self.register_warning_msg.setHTML(_('Invalid login, valid characters<br>are a-z A-Z 0-9 _ -'))
-        elif not re.match(r'^[a-z0-9_-]+@[a-z0-9_-]+\.[a-z0-9_-]+$', self.email_box.getText(), re.IGNORECASE):
+        elif not self.checkEmail(self.email_box.getText()):
             self.register_warning_msg.setHTML(_('Invalid email address'))
         elif len(self.register_pass_box.getText()) < C.PASSWORD_MIN_LENGTH:
             self.register_warning_msg.setHTML(_('Your password must contain<br>at least %d characters.') % C.PASSWORD_MIN_LENGTH)
@@ -235,6 +235,33 @@
         else:
             Window.alert(_("An error occurred and we couldn't process your request. Please report the following error name to the administrators of your network: '%s'" % result))
 
+    def checkLogin(self, text):
+        """Check if the given text is a valid login
+
+        @param text (unicode)
+        @return bool
+        """
+        # FIXME: Pyjamas re module is not stable so we use pure JS instead
+        JS("""return /^(\w|-)+$/.test(text);""")
+
+    def checkEmail(self, text):
+        """Check if the given text is a valid email address.
+
+        @param text (unicode)
+        @return bool
+        """
+        # FIXME: Pyjamas re module is not stable so we use pure JS instead
+        JS("""return /^(\w|-)+@(\w|-)+\.(\w|-)+$/.test(text);""")
+
+    def checkJID(self, text):
+        """Check if the given text is a valid JID.
+
+        @param text (unicode)
+        @return bool
+        """
+        # FIXME: Pyjamas re module is not stable so we use pure JS instead
+        JS("""return /^(\w|-)+(@(\w|-)+\.(\w|-)+)?$/.test(text);""")
+
 
 class RegisterBox(PopupPanel):