diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 38c4d298093dd183502446aef48ef29ac99e595f..743f6355f17449dd24de15c16b390ad2f7fb7493 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -94,7 +94,7 @@ Item {
     // AdvancedConnectivitySettings
     property string connectivity: qsTr("Connectivity")
     property string autoRegistration: qsTr("Auto Registration After Expired")
-    property string registrationTimeOut: qsTr("Registration expire timeout (seconds)")
+    property string registrationExpirationTime: qsTr("Registration expiration time (seconds)")
     property string networkInterface: qsTr("Network interface")
     property string useUPnP: qsTr("Use UPnP")
     property string useTURN: qsTr("Use TURN")
@@ -252,7 +252,7 @@ Item {
     property string setAPassword: qsTr("Set password")
     property string changeCurrentPassword: qsTr("Change current password")
     property string tipBackupAccount: qsTr("Backup account to a .gz file")
-    property string tipAdvancedSettingsDisplay: qsTr("Display or hide advanced settings") 
+    property string tipAdvancedSettingsDisplay: qsTr("Display or hide advanced settings")
     property string enableAccount: qsTr("Enable account")
 
     // NameRegistrationDialog
diff --git a/src/settingsadapter.cpp b/src/settingsadapter.cpp
index 5e514bc9b973af61685d274cf7b663d9acf5e533..38efe1260d385a389c5af03df77eac0613fc1526 100644
--- a/src/settingsadapter.cpp
+++ b/src/settingsadapter.cpp
@@ -890,7 +890,7 @@ SettingsAdapter::negotiationTimeoutSpinBoxValueChanged(int value)
 }
 
 void
-SettingsAdapter::registrationTimeoutSpinBoxValueChanged(int value)
+SettingsAdapter::registrationExpirationTimeSpinBoxValueChanged(int value)
 {
     auto confProps = lrcInstance_->accountModel().getAccountConfig(
         lrcInstance_->getCurrentAccountId());
diff --git a/src/settingsadapter.h b/src/settingsadapter.h
index 01815c06db23e31e004907281dfdb3f530aae79f..3483ac234d141b25f373e7d07a87b22244514f48 100644
--- a/src/settingsadapter.h
+++ b/src/settingsadapter.h
@@ -192,7 +192,7 @@ public:
 
     Q_INVOKABLE void customPortSIPSpinBoxValueChanged(int value);
     Q_INVOKABLE void negotiationTimeoutSpinBoxValueChanged(int value);
-    Q_INVOKABLE void registrationTimeoutSpinBoxValueChanged(int value);
+    Q_INVOKABLE void registrationExpirationTimeSpinBoxValueChanged(int value);
     Q_INVOKABLE void networkInterfaceSpinBoxValueChanged(int value);
     Q_INVOKABLE void audioRTPMinPortSpinBoxEditFinished(int value);
     Q_INVOKABLE void audioRTPMaxPortSpinBoxEditFinished(int value);
diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml
index 21a1adb783b3aa27b55aa0d6ca85847a5f112ddb..239c3fef4ed6b92ca010456556d7df7381493192 100644
--- a/src/settingsview/components/AdvancedConnectivitySettings.qml
+++ b/src/settingsview/components/AdvancedConnectivitySettings.qml
@@ -81,13 +81,13 @@ ColumnLayout {
             id: registrationExpireTimeoutSpinBox
             visible: isSIP
 
-            title: JamiStrings.registrationTimeOut
+            title: JamiStrings.registrationExpirationTime
             itemWidth: root.itemWidth
             bottomValue: 0
-            topValue: 3000
+            topValue: 7*24*3600
             step: 1
 
-            onNewValue: SettingsAdapter.registrationTimeoutSpinBoxValueChanged(valueField)
+            onNewValue: SettingsAdapter.registrationExpirationTimeSpinBoxValueChanged(valueField)
         }
 
         SettingSpinBox {
@@ -97,7 +97,7 @@ ColumnLayout {
             title: JamiStrings.networkInterface
             itemWidth: root.itemWidth
             bottomValue: 0
-            topValue: 65536
+            topValue: 65535
             step: 1
 
             onNewValue: SettingsAdapter.networkInterfaceSpinBoxValueChanged(valueField)