diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 023cdda445f..7f810faf82e 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -6,12 +6,14 @@ module UserGuardian
   end
 
   def can_edit_username?(user)
+    return false if (SiteSetting.sso_overrides_username? && SiteSetting.enable_sso?)
     return true if is_staff?
     return false if SiteSetting.username_change_period <= 0
     is_me?(user) && (user.post_count == 0 || user.created_at > SiteSetting.username_change_period.days.ago)
   end
 
   def can_edit_email?(user)
+    return false if (SiteSetting.sso_overrides_email? && SiteSetting.enable_sso?)
     return true if is_staff?
     return false unless SiteSetting.email_editable?
     can_edit?(user)