diff --git a/auth_admin_passkey/__init__.py b/auth_admin_passkey/__init__.py
index 088e71f640c..09c7e7d6d7b 100644
--- a/auth_admin_passkey/__init__.py
+++ b/auth_admin_passkey/__init__.py
@@ -1,23 +1,6 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 from . import model
diff --git a/auth_admin_passkey/__openerp__.py b/auth_admin_passkey/__openerp__.py
index 69b7c8b1cd6..70db54fe502 100644
--- a/auth_admin_passkey/__openerp__.py
+++ b/auth_admin_passkey/__openerp__.py
@@ -1,28 +1,11 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 {
     'name': 'Authentification - Admin Passkey',
-    'version': '8.0.2.1.1',
+    'version': '9.0.1.0.0',
     'category': 'base',
     'author': "GRAP,Odoo Community Association (OCA)",
     'website': 'http://www.grap.coop',
@@ -34,13 +17,7 @@
         'data/ir_config_parameter.xml',
         'view/res_config_view.xml',
     ],
-    'demo': [],
-    'js': [],
-    'css': [],
-    'qweb': [],
-    'images': [],
-    'post_load': '',
     'application': False,
-    'installable': False,
+    'installable': True,
     'auto_install': False,
 }
diff --git a/auth_admin_passkey/data/ir_config_parameter.xml b/auth_admin_passkey/data/ir_config_parameter.xml
index 7c7f3625d53..cc8c4de529a 100644
--- a/auth_admin_passkey/data/ir_config_parameter.xml
+++ b/auth_admin_passkey/data/ir_config_parameter.xml
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ********************************************************************** -->
-<!--Admin Passkey module for OpenERP                                        -->
-<!--Copyright (C) 2013-2014 GRAP (http://www.grap.coop)                     -->
-<!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
+<!-- © 2016 GRAP
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<!--This program is free software: you can redistribute it and/or modify    -->
-<!--it under the terms of the GNU Affero General Public License as          -->
-<!--published by the Free Software Foundation, either version 3 of the      -->
-<!--License, or (at your option) any later version.                         -->
-
-<!--This program is distributed in the hope that it will be useful,         -->
-<!--but WITHOUT ANY WARRANTY; without even the implied warranty of          -->
-<!--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           -->
-<!--GNU Affero General Public License for more details.                     -->
-
-<!--You should have received a copy of the GNU Affero General Public License-->
-<!--along with this program.  If not, see <http://www.gnu.org/licenses/>.   -->
-<!-- ********************************************************************** -->
 <openerp>
     <data noupdate="1">
 
diff --git a/auth_admin_passkey/model/__init__.py b/auth_admin_passkey/model/__init__.py
index 60c3790aabd..1a2f0492da2 100644
--- a/auth_admin_passkey/model/__init__.py
+++ b/auth_admin_passkey/model/__init__.py
@@ -1,24 +1,7 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 from . import res_config
 from . import res_users
diff --git a/auth_admin_passkey/model/res_config.py b/auth_admin_passkey/model/res_config.py
index 11c7fa083d9..6356c4b67e1 100644
--- a/auth_admin_passkey/model/res_config.py
+++ b/auth_admin_passkey/model/res_config.py
@@ -1,24 +1,7 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 from openerp.osv import fields
 from openerp.osv.orm import TransientModel
diff --git a/auth_admin_passkey/model/res_users.py b/auth_admin_passkey/model/res_users.py
index d0a5a8aa260..291a17a8df3 100644
--- a/auth_admin_passkey/model/res_users.py
+++ b/auth_admin_passkey/model/res_users.py
@@ -1,24 +1,7 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 import datetime
 
@@ -35,7 +18,6 @@ class res_users(Model):
 
     # Private Function section
     def _get_translation(self, cr, lang, text):
-        context = {'lang': lang}  # noqa: _() checks page for locals
         return _(text)
 
     def _send_email_passkey(self, cr, user_id, user_agent_env):
diff --git a/auth_admin_passkey/tests/__init__.py b/auth_admin_passkey/tests/__init__.py
index 8150785b1a4..ea1396e75d2 100644
--- a/auth_admin_passkey/tests/__init__.py
+++ b/auth_admin_passkey/tests/__init__.py
@@ -1,23 +1,6 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 from . import test_auth_admin_passkey
diff --git a/auth_admin_passkey/tests/test_auth_admin_passkey.py b/auth_admin_passkey/tests/test_auth_admin_passkey.py
index 2ce02d26c50..1374b3abb2f 100644
--- a/auth_admin_passkey/tests/test_auth_admin_passkey.py
+++ b/auth_admin_passkey/tests/test_auth_admin_passkey.py
@@ -1,24 +1,7 @@
+# -*- coding: utf-8 -*-
+# © 2016 GRAP
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Admin Passkey module for OpenERP
-#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
 import threading
 
diff --git a/auth_admin_passkey/view/res_config_view.xml b/auth_admin_passkey/view/res_config_view.xml
index 9907297051d..0bcf3eb3774 100644
--- a/auth_admin_passkey/view/res_config_view.xml
+++ b/auth_admin_passkey/view/res_config_view.xml
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ********************************************************************** -->
-<!--Admin Passkey module for OpenERP                                        -->
-<!--Copyright (C) 2013-2014 GRAP (http://www.grap.coop)                     -->
-<!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
+<!-- © 2016 GRAP
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 
-<!--This program is free software: you can redistribute it and/or modify    -->
-<!--it under the terms of the GNU Affero General Public License as          -->
-<!--published by the Free Software Foundation, either version 3 of the      -->
-<!--License, or (at your option) any later version.                         -->
-
-<!--This program is distributed in the hope that it will be useful,         -->
-<!--but WITHOUT ANY WARRANTY; without even the implied warranty of          -->
-<!--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           -->
-<!--GNU Affero General Public License for more details.                     -->
-
-<!--You should have received a copy of the GNU Affero General Public License-->
-<!--along with this program.  If not, see <http://www.gnu.org/licenses/>.   -->
-<!-- ********************************************************************** -->
 <openerp>
     <data>
 
@@ -25,7 +10,7 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//label[@string='Email']/.." position='after'>
+                <xpath expr="//label[@name='email_label']/.." position='after'>
                     <group>
                         <label for="id" string="Passkey"/>
                         <div>