diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -67,11 +67,11 @@
     user = find_by_login(login)
     if user
       return user if user.authenticated?(password)
-#      if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
-#        user.password = password
-#        user.save
-#        return user
-#      end
+      if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
+        user.password = password
+        user.save
+        return user
+      end
     end
   end
 
@@ -351,7 +351,7 @@
     def uniqueness_of_email_from_activated_users
       user = User.activated_users.find_by_email(self.email)
       if user and (user.login != self.login)
-        self.errors.add_to_base("Email has already been taken")
+        self.errors.add(:base,"Email has already been taken")
       end
     end
     
@@ -362,7 +362,7 @@
                                      :order => 'created_at DESC')
       if open_user and open_user.created_at and 
           (open_user.created_at > Time.now.gmtime - 5.minutes)
-        self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
+        self.errors.add(:base,"There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
       end
     end