diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html
index ebab9dcf2..8a1ac2e19 100644
--- a/app/portainer/views/settings/authentication/settingsAuthentication.html
+++ b/app/portainer/views/settings/authentication/settingsAuthentication.html
@@ -317,7 +317,7 @@
             <!-- !group-search-settings -->
           </div>
 
-          <oauth-settings ng-if="settings.AuthenticationMethod === 3" settings="OAuthSettings"></oauth-settings>
+          <oauth-settings ng-if="isOauthEnabled()" settings="OAuthSettings"></oauth-settings>
 
             <!-- actions -->
           <div class="form-group">
diff --git a/app/portainer/views/settings/authentication/settingsAuthenticationController.js b/app/portainer/views/settings/authentication/settingsAuthenticationController.js
index a94dfd658..dc74a3b54 100644
--- a/app/portainer/views/settings/authentication/settingsAuthenticationController.js
+++ b/app/portainer/views/settings/authentication/settingsAuthenticationController.js
@@ -15,7 +15,7 @@ function ($q, $scope, Notifications, SettingsService, FileUploadService) {
   };
 
   $scope.isOauthEnabled = function isOauthEnabled() {
-    return $scope.settings.AuthenticationMethod === 3;
+    return $scope.settings && $scope.settings.AuthenticationMethod === 3;
   };
 
   $scope.addSearchConfiguration = function() {