diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php
index 326f1a091..127374e81 100644
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -3502,10 +3502,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               'msg' => array('mailbox_modified', $username)
             );
 
-            // Track affected mailboxes for SOGo update
-            $update_sogo_mailboxes[] = $username;
-          }
-        break;
+            // Track affected mailboxes for SOGo update
+            $update_sogo_mailboxes[] = $username;
+          }
+        break;
         case 'mailbox_rename':
           $domain = $_data['domain'];
           $old_local_part = $_data['old_local_part'];
@@ -6126,7 +6126,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
             // Track affected mailboxes for SOGo update
             $update_sogo_mailboxes[] = $username;
           }
-          return true;
         break;
         case 'mailbox_templates':
           if ($_SESSION['mailcow_cc_role'] != "admin") {