lib/clearance/user.rb in fbdoorman-0.0.4 vs lib/clearance/user.rb in fbdoorman-0.0.5

@@ -52,11 +52,11 @@
           validates_presence_of     :email, :unless => Proc.new { |user| !user.fbid.blank? }
           validates_uniqueness_of   :email, :case_sensitive => false, :allow_blank => true
           validates_uniqueness_of   :fbid, :unless => Proc.new { |user| user.fbid.blank? } 
           validates_format_of       :email, :with => %r{.+@.+\..+}, :allow_blank => true
 
-          validates_presence_of     :password, :unless => Proc.new { |user| !user.fbid.blank? } #:unless => :password_optional?
-          validates_confirmation_of :password, :unless => Proc.new { |user| !user.fbid.blank? }#:unless => :password_optional?
+          validates_presence_of     :password, :unless => Proc.new { |user| !user.fbid.blank? or :password_optional? } 
+          validates_confirmation_of :password, :unless => Proc.new { |user| !user.fbid.blank? or :password_optional? }
         end
       end
     end
 
     module Callbacks