diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 1de2730..3f2848f 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -2,9 +2,6 @@
 
 class RegistrationsController < Devise::RegistrationsController
 
-  prepend Dmpopidor::Controllers::Registrations
-
-  # SEE MODULE
   def edit
     @user = current_user
     @prefs = @user.get_preferences(:email)
@@ -229,7 +226,7 @@
       set_gettext_locale
       set_flash_message :notice, success_message(current_user, _("saved"))
       # Sign in the user bypassing validation in case his password changed
-      sign_in current_user, bypass: true
+      sign_in current_user, bypass_sign_in: true
       redirect_to "#{edit_user_registration_path}\#personal-details",
         notice: success_message(current_user, _("saved"))
 
@@ -255,7 +252,7 @@
       # Method defined at controllers/application_controller.rbset_gettext_locale
       set_flash_message :notice, success_message(current_user, _("saved"))
       # TODO this method is deprecated
-      sign_in current_user, bypass: true
+      sign_in current_user, bypass_sign_in: true
       redirect_to "#{edit_user_registration_path}\#password-details",
         notice: success_message(current_user, _("saved"))
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 7b7bbd0..672cf47 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -148,7 +148,7 @@
   # = Callbacks =
   # =============
 
-  before_update :clear_other_organisation, if: :org_id_changed?
+  before_update :clear_other_organisation, :if => proc { org_id_changed? &&  org_id != Org.find_by(is_other: true).id }
 
   before_update :clear_department_id, if: :org_id_changed?