diff --git a/www/api/class/centreon_topcounter.class.php b/www/api/class/centreon_topcounter.class.php
index 98bf38bbb54..3fb3a56b929 100755
--- a/www/api/class/centreon_topcounter.class.php
+++ b/www/api/class/centreon_topcounter.class.php
@@ -191,6 +191,10 @@ public function putAutoLoginToken()
      */
     public function getUser()
     {
+        $enableAutoLogin = false;
+        $enableAutoLoginShortcut = false;
+        $autoLoginKey = null;
+
         if (!isset($_SESSION['centreon'])) {
             throw new \RestUnauthorizedException('Session does not exists.');
         }
@@ -204,8 +208,8 @@ public function getUser()
             $this->soundNotificationsEnabled = true;
         }
 
-        /* Get autologinkey */
-        $query = 'SELECT contact_autologin_key FROM contact WHERE contact_id = ' . (int)$user->user_id;
+        /* Is the autologin feature enabled ? */
+        $query = 'SELECT value FROM options WHERE options.key = "enable_autologin"';
 
         try {
             $res = $this->pearDB->query($query);
@@ -213,10 +217,44 @@ public function getUser()
             throw new \RestInternalServerErrorException('Error getting the user.');
         }
 
-        if ($res->rowCount() === 0) {
-            throw new \RestUnauthorizedException('User does not exists.');
+        if ($row = $res->fetch()) {
+            $enableAutoLogin = $row['value'] == '1' ? true : false;
+        }
+
+	    /* Do we need to display the autologin shortcut ? */
+        $query = 'SELECT value FROM options WHERE options.key = "display_autologin_shortcut"';
+
+        try {
+            $res = $this->pearDB->query($query);
+        } catch (\Exception $e) {
+            throw new \RestInternalServerErrorException('Error getting the user.');
+        }
+
+        if ($row = $res->fetch()) {
+            $enableAutoLoginShortcut = $row['value'] == '1' ? true : false;
+        }
+
+        /* If the autologin feature is enabled then fetch the autologin key
+         * And display the shortcut if the option is enabled
+         */
+        if ($enableAutoLogin && $enableAutoLoginShortcut) {
+            /* Get autologinkey */
+            $query = 'SELECT contact_autologin_key FROM contact WHERE contact_id = ' . (int)$user->user_id;
+
+            try {
+                $res = $this->pearDB->query($query);
+            } catch (\Exception $e) {
+                throw new \RestInternalServerErrorException('Error getting the user.');
+            }
+
+            if ($res->rowCount() === 0) {
+                throw new \RestUnauthorizedException('User does not exists.');
+            }
+
+            if ($row = $res->fetch()) {
+                $autoLoginKey = $row['contact_autologin_key'];
+            }
         }
-        $row = $res->fetch();
 
         return array(
             'userId' => $user->user_id,
@@ -225,7 +263,7 @@ public function getUser()
             'locale' => $locale,
             'timezone' => $user->gmt,
             'hasAccessToProfile' => $this->hasAccessToProfile,
-            'autologinkey' => $row['contact_autologin_key'],
+            'autologinkey' => $autoLoginKey,
             'soundNotificationsEnabled' => $this->soundNotificationsEnabled
         );
     }
diff --git a/www/front_src/src/components/userMenu/index.js b/www/front_src/src/components/userMenu/index.js
index 49f06694b49..80de273fb3b 100755
--- a/www/front_src/src/components/userMenu/index.js
+++ b/www/front_src/src/components/userMenu/index.js
@@ -120,7 +120,7 @@ class UserMenu extends Component {
                   </span>
                 </li>
                 {autologinkey &&
-                  <React.Fragment>
+                  <>
                     <button
                       className={'submenu-user-button'}
                       onClick={this.onCopy}
@@ -134,7 +134,7 @@ class UserMenu extends Component {
                       ref={node => this.autologinNode = node}
                       value={autolink}
                     />
-                  </React.Fragment>
+                  </>
                 }
               </ul>
               <div class="button-wrap">