diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 70bb8d163..107d07ce2 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -737,7 +737,7 @@ function getAcctCircleHTML($skin, $user=null) {
   if ( ZM_OPT_USE_AUTH and $user ) {
     $result .= '<p id="getAcctCircleHTML" class="navbar-text mr-2">'.PHP_EOL;
     $result .= makeLink('#', '<i class="material-icons">account_circle</i> '.  $user['Username'],
-      (ZM_AUTH_TYPE == 'builtin'), 'data-toggle="modal" data-target="#modalLogout" data-backdrop="false"' ).PHP_EOL;
+      (ZM_AUTH_TYPE == 'builtin'), 'id="logoutButton" data-toggle="modal" data-target="#modalLogout" data-backdrop="false"' ).PHP_EOL;
     $result .= '</p>'.PHP_EOL;
   }
   
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 5ac5999ac..595da9788 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -240,7 +240,7 @@ if ( currentView != 'none' && currentView != 'login' ) {
 
   $j(document).ready(function() {
     // Load the Logout and State modals into the dom
-    getLogoutModal();
+    $j('#logoutButton').click(getLogoutModal());
     if ( canEditSystem ) $j('#stateModalBtn').click(getStateModal);
 
     // Trigger autorefresh of the widget bar stats on the navbar