X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3244635aa11878135a014cf2c9ec9177f8e9d0ba..89cf0dbe9dd87c12bf8c65dd6e87f888d1349a37:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 54b3fa371..0b8b512ee 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,8 +24,8 @@ class User < ActiveRecord::Base
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
-  validates_length_of :email, :within => 6..255
-  validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  validates_email_format_of :email
+  validates_email_format_of :new_email, :allow_blank => true
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true