diff --git a/server/controllers/system/edit-settings.php b/server/controllers/system/edit-settings.php
index dfdf7352..879a8f12 100755
--- a/server/controllers/system/edit-settings.php
+++ b/server/controllers/system/edit-settings.php
@@ -53,7 +53,7 @@ class EditSettingsController extends Controller {
         ];
 
         foreach($settings as $setting) {
-            if(Controller::request($setting)!==null) {
+            if(Controller::request($setting)) {
                 $settingInstance = Setting::getSetting($setting);
                 $settingInstance->value = Controller::request($setting);
                 $settingInstance->store();
@@ -68,7 +68,7 @@ class EditSettingsController extends Controller {
 
         Response::respondSuccess();
     }
-
+    
     public function handleLanguages() {
         $allowed = json_decode(Controller::request('allowedLanguages'));
         $supported = json_decode(Controller::request('supportedLanguages'));
@@ -83,4 +83,4 @@ class EditSettingsController extends Controller {
         }
 
     }
-}
+}
\ No newline at end of file
diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php
index 5cea221d..22679a0d 100755
--- a/server/controllers/ticket/change-department.php
+++ b/server/controllers/ticket/change-department.php
@@ -66,13 +66,10 @@ class ChangeDepartmentController extends Controller {
         $ticket->addEvent($event);
         $ticket->department = $department;
         $ticket->unread = true;
-        if(!Controller::getLoggedUser()->sharedDepartmentList->includesId($department->id)) {
-            $ticket->owner = null;
-        }
         $ticket->store();
 
         Log::createLog('DEPARTMENT_CHANGED', $ticket->ticketNumber);
 
         Response::respondSuccess();
     }
-}
+}
\ No newline at end of file
diff --git a/tests/system/edit-settings.rb b/tests/system/edit-settings.rb
index f39395b7..69223599 100644
--- a/tests/system/edit-settings.rb
+++ b/tests/system/edit-settings.rb
@@ -6,7 +6,7 @@ describe'system/edit-settings' do
         result= request('/system/edit-settings', {
             "csrf_userid" => $csrf_userid,
             "csrf_token" => $csrf_token,
-            "maintenance-mode" => 0,
+            "maintenance-mode" => false,
             "time-zone" => -3,
             "layout" => 'full-width',
             "allow-attachments" => 1,
@@ -82,4 +82,4 @@ describe'system/edit-settings' do
 
         request('/user/logout')
     end
-end
+end
\ No newline at end of file