diff --git a/app/models/user/staff.rb b/app/models/user/staff.rb
index 9f390356b..af4b87017 100644
--- a/app/models/user/staff.rb
+++ b/app/models/user/staff.rb
@@ -6,6 +6,6 @@ module User::Staff
   end
 
   def staff?
-    email_address.ends_with?("@37signals.com")
+    email_address.ends_with?("@37signals.com") || email_address.ends_with?("@basecamp.com")
   end
 end