diff --git a/auth_admin_passkey/__init__.py b/auth_admin_passkey/__init__.py
index 088e71f640c..98c34442e3f 100644
--- a/auth_admin_passkey/__init__.py
+++ b/auth_admin_passkey/__init__.py
@@ -1,23 +1,8 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import model
+from . import model
\ No newline at end of file
diff --git a/auth_admin_passkey/__openerp__.py b/auth_admin_passkey/__openerp__.py
index 69b7c8b1cd6..d8aea27c462 100644
--- a/auth_admin_passkey/__openerp__.py
+++ b/auth_admin_passkey/__openerp__.py
@@ -1,30 +1,17 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'Authentification - Admin Passkey',
-    'version': '8.0.2.1.1',
+    'name': 'Authentication - Admin Passkey',
+    'version': '9.0.1.0.0',
     'category': 'base',
-    'author': "GRAP,Odoo Community Association (OCA)",
+    'author': "GRAP, Odoo Community Association (OCA),"
+            "Serpent Consulting Services Pvt. Ltd.",
+                
     'website': 'http://www.grap.coop',
     'license': 'AGPL-3',
     'depends': [
@@ -41,6 +28,5 @@
     'images': [],
     'post_load': '',
     'application': False,
-    'installable': False,
     'auto_install': False,
 }
diff --git a/auth_admin_passkey/model/__init__.py b/auth_admin_passkey/model/__init__.py
index 60c3790aabd..0e078a7efbd 100644
--- a/auth_admin_passkey/model/__init__.py
+++ b/auth_admin_passkey/model/__init__.py
@@ -1,24 +1,9 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 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..e7d65150fd5 100644
--- a/auth_admin_passkey/model/res_config.py
+++ b/auth_admin_passkey/model/res_config.py
@@ -1,24 +1,9 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from openerp.osv import fields
 from openerp.osv.orm import TransientModel
@@ -64,13 +49,13 @@ def set_auth_admin_passkey_send_to_user(self, cr, uid, ids, context=None):
         'auth_admin_passkey_send_to_admin': fields.boolean(
             'Send email to admin user.',
             help="""When the administrator use his password to login in """
-            """with a different account, OpenERP will send an email """
+            """with a different account, ODOO will send an email """
             """to the admin user.""",
         ),
         'auth_admin_passkey_send_to_user': fields.boolean(
             string='Send email to user.',
             help="""When the administrator use his password to login in """
-            """with a different account, OpenERP will send an email """
+            """with a different account, ODOO will send an email """
             """to the account user.""",
         ),
     }
diff --git a/auth_admin_passkey/model/res_users.py b/auth_admin_passkey/model/res_users.py
index d0a5a8aa260..10901b042ab 100644
--- a/auth_admin_passkey/model/res_users.py
+++ b/auth_admin_passkey/model/res_users.py
@@ -1,24 +1,9 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import datetime
 
@@ -83,7 +68,7 @@ def _send_email_same_password(self, cr, login_user):
             mail_obj.create(cr, SUPERUSER_ID, {
                 'email_to': admin_user.email,
                 'subject': self._get_translation(
-                    cr, admin_user.lang, _('[WARNING] OpenERP Security Risk')),
+                    cr, admin_user.lang, _('[WARNING] ODOO Security Risk')),
                 'body_html': self._get_translation(
                     cr, admin_user.lang, _(
                         """<pre>User with login '%s' has the same """
diff --git a/auth_admin_passkey/tests/__init__.py b/auth_admin_passkey/tests/__init__.py
index 8150785b1a4..4773758064a 100644
--- a/auth_admin_passkey/tests/__init__.py
+++ b/auth_admin_passkey/tests/__init__.py
@@ -1,23 +1,8 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 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..ceae32a63db 100644
--- a/auth_admin_passkey/tests/test_auth_admin_passkey.py
+++ b/auth_admin_passkey/tests/test_auth_admin_passkey.py
@@ -1,24 +1,9 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2013-2014 GRAP (http://www.grap.coop)
+# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+# Copyright 2016 Serpent Consulting Services Pvt. Ltd. 
+#                 (http://www.serpentcs.com)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import threading
 
diff --git a/auth_admin_passkey/view/res_config_view.xml b/auth_admin_passkey/view/res_config_view.xml
index 9907297051d..3012c0451ba 100644
--- a/auth_admin_passkey/view/res_config_view.xml
+++ b/auth_admin_passkey/view/res_config_view.xml
@@ -25,7 +25,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="//group/div[@name='email']" position='after'>
                     <group>
                         <label for="id" string="Passkey"/>
                         <div>