diff --git a/app/models/account.rb b/app/models/account.rb
index ca91ae274..bd7a1930b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -816,7 +816,7 @@ def can_switch_to_judge?
   end
 
   def can_switch_to_mentor?
-    if is_an_ambassador?
+    if chapter_ambassador? || club_ambassador?
       true
     elsif is_a_judge?
       !!ENV.fetch("ENABLE_MENTOR_MODE_FOR_ALL_JUDGES", false) ||