diff --git a/product/ERP5Security/ERP5ExternalAuthenticationPlugin.py b/product/ERP5Security/ERP5ExternalAuthenticationPlugin.py
index 60cee2d2ba511aecb30b264a311fbab79de630a7..2d8ff5049d741b1aab9df666a2788f6dd7ee45ef 100644
--- a/product/ERP5Security/ERP5ExternalAuthenticationPlugin.py
+++ b/product/ERP5Security/ERP5ExternalAuthenticationPlugin.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Francois-Xavier Algrain <fxalgrain@tiolive.com>
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
+# programmers who take the whole responsibility of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
 # End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly adviced to contract a Free Software
 # Service Company
 #
 # This program is Free Software; you can redistribute it and/or
@@ -55,7 +54,7 @@ def addERP5ExternalAuthenticationPlugin(dispatcher, id, title=None, user_id_key=
                               REQUEST=None):
   """ Add a ERP5ExternalAuthenticationPlugin to a Pluggable Auth Service. """
 
-  plugin = ERP5ExternalAuthenticationPlugin( id, title, user_id_key)
+  plugin = ERP5ExternalAuthenticationPlugin(id, title, user_id_key)
   dispatcher._setObject(plugin.getId(), plugin)
 
   if REQUEST is not None:
@@ -121,7 +120,7 @@ class ERP5ExternalAuthenticationPlugin(ERP5UserManager):
   #     IAuthenticationPlugin    #
   ################################
   security.declarePrivate('authenticateCredentials')
-  def authenticateCredentials( self, credentials ):
+  def authenticateCredentials(self, credentials):
     """Authentificate with credentials"""
     login = credentials.get('external_login', None)
     # Forbidden the usage of the super user.
@@ -189,9 +188,9 @@ class ERP5ExternalAuthenticationPlugin(ERP5UserManager):
   manage_editERP5ExternalAuthenticationPluginForm = PageTemplateFile(
       'www/ERP5Security_editERP5ExternalAuthenticationPlugin',
       globals(),
-      __name__='manage_editERP5ExternalAuthenticationPluginForm' )
+      __name__='manage_editERP5ExternalAuthenticationPluginForm')
 
-  security.declareProtected( ManageUsers, 'manage_editERP5ExternalAuthenticationPlugin' )
+  security.declareProtected(ManageUsers, 'manage_editERP5ExternalAuthenticationPlugin')
   def manage_editERP5ExternalAuthenticationPlugin(self, user_id_key, RESPONSE=None):
     """Edit the object"""
     error_message = ''
@@ -211,7 +210,7 @@ class ERP5ExternalAuthenticationPlugin(ERP5UserManager):
         message = "Updated"
         RESPONSE.redirect('%s/manage_editERP5ExternalAuthenticationPluginForm'
                           '?manage_tabs_message=%s'
-                          % ( self.absolute_url(), message )
+                          % (self.absolute_url(), message)
                           )
 
 #List implementation of class
diff --git a/product/ERP5Security/tests/testERP5Security.py b/product/ERP5Security/tests/testERP5Security.py
index b198bc7b4139831706c1b4a302c1af337687c751..f077e2b75091ee46c4a54bd9366104fa9b6248ee 100644
--- a/product/ERP5Security/tests/testERP5Security.py
+++ b/product/ERP5Security/tests/testERP5Security.py
@@ -270,7 +270,7 @@ class TestUserManagement(ERP5TypeTestCase):
   def test_MultiplePersonReferenceConcurrentTransaction(self):
     """
     Tests that it's refused to create two Persons with same reference.
-    Check if both persons are created in 2 concurrent transactions. 
+    Check if both persons are created in 2 concurrent transactions.
     For now, just verify that serialize is called on person_module.
     """
     class DummyTestException(Exception):
@@ -705,7 +705,7 @@ class TestLocalRoleManagement(ERP5TypeTestCase):
     assignment.open()
     self.stepTic()
 
-    # encrypt & decrypt works 
+    # encrypt & decrypt works
     key = erp5_auth_key_plugin.encrypt(reference)
     self.assertNotEquals(reference, key)
     self.assertEquals(reference, erp5_auth_key_plugin.decrypt(key))
@@ -717,7 +717,7 @@ class TestLocalRoleManagement(ERP5TypeTestCase):
     self.assertEqual(response.getStatus(), 302)
     self.assertTrue('location' in response.headers.keys())
     self.assertTrue(response.headers['location'].endswith('login_form'))
-     
+
     # view front page we should be logged in if we use authentication key
     response = self.publish('%s?__ac_key=%s' %(base_url, key))
     self.assertEqual(response.getStatus(), 200)