diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 23c964e1236..2b624c0012b 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -14,8 +14,8 @@ module UserGuardian
 
   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?
+    return true if is_staff?
     can_edit?(user)
   end