diff --git a/app/models/user.rb b/app/models/user.rb
index 14f1af2..8ea0608 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -108,7 +108,7 @@
   # @param new_organisation_id [Integer] the id for an organisation
   # @return [String] the empty string as a causality of setting api_token
   def org_id=(new_org_id)
-    unless self.can_change_org? || new_org_id.nil? || self.org.nil?
+    unless self.can_change_org? || new_org_id.nil? || self.org.nil? || (new_org_id.to_s == self.org.id.to_s)
       # rip all permissions from the user
       self.perms.delete_all
     end