diff --git a/app/views/account/_signup_form.html.erb b/app/views/account/_signup_form.html.erb
index 0d31980..28690e3 100644
--- a/app/views/account/_signup_form.html.erb
+++ b/app/views/account/_signup_form.html.erb
@@ -135,10 +135,6 @@
 
 <script type="text/javascript">
 jQuery(function($) {
-  $.validator.addMethod('validEmail', function(value, element) {
-      var regex = /^([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})$/i;
-      return this.optional(element) || regex.test(value);
-  }, 'Please enter a valid e-mail');
 
   $('#signup-form input[type=text], #signup-form textarea').each(function() {
     $(this).bind('blur', function() {
@@ -174,7 +170,7 @@ jQuery(function($) {
     $('#signup-balloon').fadeIn('slow');
   });
   $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
-  $('#signup-form').validate({ rules: { 'user[email]': { email: true, validEmail: true } }, messages: { 'user[email]' : '' } });
+  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
   $('#user_email').focus(function() {
     $('#email-balloon').fadeIn('slow');
   });
diff --git a/lib/noosfero/constants.rb b/lib/noosfero/constants.rb
index 891256c..e1d97c7 100644
--- a/lib/noosfero/constants.rb
+++ b/lib/noosfero/constants.rb
@@ -1,5 +1,5 @@
 module Noosfero::Constants
-  EMAIL_FORMAT = /\A([^\W_])([\w._-]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
+  EMAIL_FORMAT = /\A([^@\s]+)@((?:[-_a-z0-9]+\.)+[a-z]{2,})\Z/i
   INTEGER_FORMAT = /\A\d*\Z/i
   PROFILE_PER_PAGE = 10
 end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 09e202d..4551feb 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -14,24 +14,6 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
-  should 'not create user with wrong email' do
-    user = User.new(login: 'test_user', email: 'tes*te@hotmail.com',
-                    password: '123456', password_confirmation: '123456')
-    user.save
-    assert_equal user.valid?, false
-    assert !user.errors[:email].nil?
-
-    user.email = '_teste@hotmail.com'
-    user.save
-    assert_equal user.valid?, false
-    assert !user.errors[:email].nil?
-
-    user.email = 'teste$@hotmail.com'
-    user.save
-    assert_equal user.valid?, false
-    assert !user.errors[:email].nil?
-  end
-
   def test_should_require_login
     assert_no_difference 'User.count' do
       u = new_user(:login => nil)
--
libgit2 0.21.2