diff --git a/app/models/user.rb b/app/models/user.rb index 72e90cf56..53b4fd40d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,7 +13,7 @@ class User < ActiveRecord::Base validates :username, :password, presence: true validates :identity_code, uniqueness: true, allow_blank: true validates :identity_code, presence: true, if: -> { country.iso == 'EE' } - validates :email, presence: true, if: -> { country.iso == 'LV' } + validates :email, presence: true, if: -> { country.iso != 'EE' } validates :registrar, presence: true, if: -> { !admin } before_save -> { self.registrar = nil if admin? }