diff --git a/CHANGES.rst b/CHANGES.rst
index ad5778db2..6522acffc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,7 +24,8 @@ Changes to be released in next version
  * VoIP: Handle application inactive state too for VoIP pushes (#4269).
  * VoIP: Do not terminate the app if protected data not available (#4419).
  * KeyVerification: Listen for request state changes and show QR reader option when it's ready.
- * HomeViewController: Don't clip the home view when searching for rooms on iPhone 12 Pro Max (#4450)
+ * NSE: Recreate background sync service if credentials changed (#3695).
+ * HomeViewController: Don't clip the home view when searching for rooms on iPhone 12 Pro Max (#4450).
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Categories/UIButton.swift b/Riot/Categories/UIButton.swift
index 0e3af78ef..6f896bb58 100644
--- a/Riot/Categories/UIButton.swift
+++ b/Riot/Categories/UIButton.swift
@@ -40,4 +40,15 @@ extension UIButton {
         let image = UIImage.vc_image(from: color)
         self.setBackgroundImage(image, for: state)
     }
+        
+    /// Shortcut to button label property `adjustsFontForContentSizeCategory`
+    @IBInspectable
+    var vc_adjustsFontForContentSizeCategory: Bool {
+        get {
+            return self.titleLabel?.adjustsFontForContentSizeCategory ?? false
+        }
+        set {
+            self.titleLabel?.adjustsFontForContentSizeCategory = newValue
+        }
+    }
 }
diff --git a/Riot/Modules/SideMenu/SideMenuActionView.swift b/Riot/Modules/SideMenu/SideMenuActionView.swift
index 6d4dc27a6..72ff6a852 100644
--- a/Riot/Modules/SideMenu/SideMenuActionView.swift
+++ b/Riot/Modules/SideMenu/SideMenuActionView.swift
@@ -53,6 +53,7 @@ final class SideMenuActionView: UIView, NibOwnerLoadable {
     
     private func commonInit() {
         self.button.contentHorizontalAlignment = .left
+        self.button.titleLabel?.lineBreakMode = .byTruncatingTail
     }
     
     convenience init() {
diff --git a/Riot/Modules/SideMenu/SideMenuActionView.xib b/Riot/Modules/SideMenu/SideMenuActionView.xib
index b1ea1a367..c23367b54 100644
--- a/Riot/Modules/SideMenu/SideMenuActionView.xib
+++ b/Riot/Modules/SideMenu/SideMenuActionView.xib
@@ -21,11 +21,17 @@
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pK8-ke-xvx">
                     <rect key="frame" x="0.0" y="0.0" width="217" height="59"/>
+                    <constraints>
+                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="qXw-QN-EC5"/>
+                    </constraints>
                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                     <inset key="titleEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/>
                     <state key="normal" title="Settings" image="side_menu_action_icon_settings">
                         <color key="titleColor" systemColor="systemGrayColor"/>
                     </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="vc_adjustsFontForContentSizeCategory" value="YES"/>
+                    </userDefinedRuntimeAttributes>
                     <connections>
                         <action selector="buttonAction:" destination="-1" eventType="touchUpInside" id="tNk-fq-wFy"/>
                     </connections>
diff --git a/Riot/Modules/SideMenu/SideMenuVersionView.xib b/Riot/Modules/SideMenu/SideMenuVersionView.xib
index 21922cf7d..76f5243f1 100644
--- a/Riot/Modules/SideMenu/SideMenuVersionView.xib
+++ b/Riot/Modules/SideMenu/SideMenuVersionView.xib
@@ -17,7 +17,7 @@
         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnS-MP-1oq">
             <rect key="frame" x="0.0" y="0.0" width="414" height="134"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.4.1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="koz-RT-qji">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.4.1" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="koz-RT-qji">
                     <rect key="frame" x="0.0" y="30" width="414" height="84"/>
                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                     <nil key="textColor"/>
diff --git a/Riot/Modules/SideMenu/SideMenuViewController.storyboard b/Riot/Modules/SideMenu/SideMenuViewController.storyboard
index e8ff4cd3e..8b43a409d 100644
--- a/Riot/Modules/SideMenu/SideMenuViewController.storyboard
+++ b/Riot/Modules/SideMenu/SideMenuViewController.storyboard
@@ -39,13 +39,13 @@
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="pj0-XK-IJ2">
                                                                 <rect key="frame" x="20" y="92" width="374" height="46"/>
                                                                 <subviews>
-                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbo-IX-VUb">
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbo-IX-VUb">
                                                                         <rect key="frame" x="0.0" y="0.0" width="374" height="24"/>
                                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWw-Gn-nd0">
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWw-Gn-nd0">
                                                                         <rect key="frame" x="0.0" y="28" width="374" height="18"/>
                                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                         <nil key="textColor"/>
diff --git a/Riot/Modules/SideMenu/SideMenuViewController.swift b/Riot/Modules/SideMenu/SideMenuViewController.swift
index 4b61e3a20..0851ec8df 100644
--- a/Riot/Modules/SideMenu/SideMenuViewController.swift
+++ b/Riot/Modules/SideMenu/SideMenuViewController.swift
@@ -165,7 +165,10 @@ final class SideMenuViewController: UIViewController {
         for sideMenuItem in viewData.sideMenuItems {
             let sideMenuActionView = SideMenuActionView.instantiate()
             sideMenuActionView.translatesAutoresizingMaskIntoConstraints = false
-            sideMenuActionView.heightAnchor.constraint(equalToConstant: Constants.sideMenuActionViewHeight).isActive = true
+            let heightConstraint = sideMenuActionView.heightAnchor.constraint(equalToConstant: 0)
+            heightConstraint.priority = .defaultLow
+            heightConstraint.isActive = true
+            
             sideMenuActionView.update(theme: self.theme)
             sideMenuActionView.fill(with: sideMenuItem)
             sideMenuActionView.delegate = self
diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
index 3ac8cd0bd..85bdde3d5 100644
--- a/RiotNSE/NotificationService.swift
+++ b/RiotNSE/NotificationService.swift
@@ -163,7 +163,7 @@ class NotificationService: UNNotificationServiceExtension {
         MXKAccountManager.shared()?.forceReloadAccounts()
         self.userAccount = MXKAccountManager.shared()?.activeAccounts.first
         if let userAccount = userAccount {
-            if NotificationService.backgroundSyncService == nil {
+            if NotificationService.backgroundSyncService?.credentials != userAccount.mxCredentials {
                 MXLog.debug("[NotificationService] setup: MXBackgroundSyncService init: BEFORE")
                 self.logMemory()
                 NotificationService.backgroundSyncService = MXBackgroundSyncService(withCredentials: userAccount.mxCredentials)