diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt
index eaa8153..fa16202 100644
--- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt
+++ b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt
@@ -86,6 +86,14 @@ class GatewayApi(
         }.body()
     }
 
+    suspend fun changePassword(token: String, request: PasswordChangeRequest) {
+        client.patch("$baseUrl/user/password") {
+            auth(token)
+            contentType(ContentType.Application.Json)
+            setBody(request)
+        }
+    }
+
     private fun HttpRequestBuilder.auth(token: String) {
         header(HttpHeaders.Authorization, "Bearer $token")
     }
@@ -118,6 +126,11 @@ class GatewayApi(
         val states: Map<ProcessingState, Date>
     )
 
+    data class PasswordChangeRequest(
+        val currentPassword: String,
+        val newPassword: String
+    )
+
     data class Message(
         val id: String,
         val message: String,
diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt
index b105f2a..d6f4830 100644
--- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt
+++ b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt
@@ -63,6 +63,27 @@ class GatewayService(
         this._api = null
     }
 
+    suspend fun changePassword(current: String, new: String) {
+        val info = settings.registrationInfo
+            ?: throw IllegalStateException("The device is not registered on the server")
+
+        this.api.changePassword(
+            info.token,
+            GatewayApi.PasswordChangeRequest(current, new)
+        )
+
+        settings.registrationInfo = info.copy(password = new)
+
+        events.emit(
+            DeviceRegisteredEvent(
+                api.hostname,
+                info.login,
+                new,
+            )
+        )
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
     internal suspend fun getWebHooks(): List<GatewayApi.WebHook> {
         val settings = settings.registrationInfo
         return if (settings != null) {
diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt
index 4c617ab..e1e1b12 100644
--- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt
+++ b/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt
@@ -17,6 +17,11 @@ class GatewaySettings(
         get() = storage.get(REGISTRATION_INFO)
         set(value) = storage.set(REGISTRATION_INFO, value)
 
+    val username: String?
+        get() = registrationInfo?.login
+    val password: String?
+        get() = registrationInfo?.password
+
     val privateUrl: String?
         get() = storage.get<String?>(CLOUD_URL)
     val privateToken: String?
diff --git a/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt b/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt
index d57c758..a1338ea 100644
--- a/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt
+++ b/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt
@@ -10,30 +10,17 @@ import android.provider.Settings
 import android.text.InputType
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import androidx.core.content.edit
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import me.capcom.smsgateway.BuildConfig
 import me.capcom.smsgateway.R
-import me.capcom.smsgateway.modules.gateway.GatewaySettings
 
 class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
 
-        findPreference<EditTextPreference>("gateway.cloud_url")?.setSummaryProvider {
-            val hostname = preferenceManager.sharedPreferences?.getString(it.key, null)
-            if (hostname.isNullOrEmpty()) {
-                preferenceManager.sharedPreferences?.edit(true) {
-                    putString(it.key, GatewaySettings.PUBLIC_URL)
-                }
-                return@setSummaryProvider GatewaySettings.PUBLIC_URL
-            }
-            return@setSummaryProvider hostname
-        }
-
         findPreference<Preference>("transient.app_version")?.summary =
             "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
 
@@ -48,9 +35,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     override fun onDisplayPreferenceDialog(preference: Preference) {
-        if (preference.key == "encryption.passphrase"
-            || preference.key == "gateway.private_token"
-        ) {
+        if (preference.key == "encryption.passphrase") {
             (preference as EditTextPreference).setOnBindEditTextListener {
                 it.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
                 it.setSelectAllOnFocus(true)
@@ -58,13 +43,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
             }
         }
 
-        if (preference.key == "gateway.cloud_url") {
-            (preference as EditTextPreference).setOnBindEditTextListener {
-                it.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
-                it.setSelectAllOnFocus(true)
-            }
-        }
-
         if (preference.key == "ping.interval_seconds"
             || preference.key == "logs.lifetime_days"
             || preference.key == "webhooks.retry_count"
diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt b/app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt
new file mode 100644
index 0000000..b663261
--- /dev/null
+++ b/app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt
@@ -0,0 +1,26 @@
+package me.capcom.smsgateway.ui.settings
+
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.View
+import android.widget.Toast
+import androidx.preference.PreferenceFragmentCompat
+
+abstract class BasePreferenceFragment : PreferenceFragmentCompat() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val backgroundValue = TypedValue()
+        requireContext().theme.resolveAttribute(
+            android.R.attr.colorBackground,
+            backgroundValue,
+            true
+        )
+
+        view.setBackgroundColor(backgroundValue.data)
+    }
+
+    protected fun showToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt b/app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt
new file mode 100644
index 0000000..72c175f
--- /dev/null
+++ b/app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt
@@ -0,0 +1,115 @@
+package me.capcom.smsgateway.ui.settings
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.text.InputType
+import android.view.View
+import androidx.core.content.edit
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import kotlinx.coroutines.launch
+import me.capcom.smsgateway.R
+import me.capcom.smsgateway.modules.gateway.GatewayService
+import me.capcom.smsgateway.modules.gateway.GatewaySettings
+import org.koin.android.ext.android.inject
+import java.net.URL
+
+class CloudServerSettingsFragment : BasePreferenceFragment() {
+
+    private val settings: GatewaySettings by inject()
+    private val service: GatewayService by inject()
+
+    @SuppressLint("NotifyDataSetChanged")
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.cloud_server_preferences, rootKey)
+
+        findPreference<EditTextPreference>("gateway.cloud_url")?.setSummaryProvider {
+            val hostname = preferenceManager.sharedPreferences?.getString(it.key, null)
+            if (hostname.isNullOrEmpty()) {
+                preferenceManager.sharedPreferences?.edit(true) {
+                    putString(it.key, GatewaySettings.PUBLIC_URL)
+                }
+                return@setSummaryProvider GatewaySettings.PUBLIC_URL
+            }
+            return@setSummaryProvider hostname
+        }
+
+
+        findPreference<EditTextPreference>("gateway.cloud_url")?.setOnPreferenceChangeListener { _, newValue ->
+            val value = newValue as? String
+            if (value.isNullOrEmpty()) {
+                return@setOnPreferenceChangeListener true
+            }
+
+            try {
+                URL(value)
+            } catch (e: Exception) {
+                showToast(getString(R.string.invalid_url))
+                return@setOnPreferenceChangeListener false
+            }
+
+            true
+        }
+
+        findPreference<EditTextPreference>("gateway.username")?.setSummaryProvider {
+            settings.username ?: getString(R.string.not_set)
+        }
+        findPreference<EditTextPreference>("gateway.password")?.apply {
+            setSummaryProvider {
+                settings.password ?: getString(R.string.not_set)
+            }
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val value = newValue as? String
+                if (value == null || value.length < 14) {
+                    showToast(getString(R.string.password_must_be_at_least_14_characters))
+                    return@setOnPreferenceChangeListener false
+                }
+
+                this@CloudServerSettingsFragment.lifecycleScope.launch {
+                    try {
+                        requireActivity().findViewById<View>(R.id.progressBar).isVisible = true
+                        service.changePassword(settings.password ?: "", value)
+                        listView.adapter?.notifyDataSetChanged()
+                        showToast(getString(R.string.password_changed_successfully))
+                    } catch (e: Exception) {
+                        showToast(getString(R.string.failed_to_change_password, e.message))
+                    } finally {
+                        requireActivity().findViewById<View>(R.id.progressBar).isVisible = false
+                    }
+                }
+
+                true
+            }
+        }
+    }
+
+    override fun onDisplayPreferenceDialog(preference: Preference) {
+        if (preference.key == "gateway.cloud_url") {
+            (preference as EditTextPreference).setOnBindEditTextListener {
+                it.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
+                it.setSelectAllOnFocus(true)
+                it.selectAll()
+            }
+        }
+
+        if (preference.key == "gateway.private_token") {
+            (preference as EditTextPreference).setOnBindEditTextListener {
+                it.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+                it.setSelectAllOnFocus(true)
+                it.selectAll()
+            }
+        }
+
+        if (preference.key == "gateway.password") {
+            (preference as EditTextPreference).setOnBindEditTextListener {
+                it.inputType = InputType.TYPE_CLASS_TEXT
+                it.text = null
+            }
+        }
+
+        super.onDisplayPreferenceDialog(preference)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt b/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt
index 965dde7..a1e6e5c 100644
--- a/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt
+++ b/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt
@@ -2,28 +2,11 @@ package me.capcom.smsgateway.ui.settings
 
 import android.os.Bundle
 import android.text.InputType
-import android.util.TypedValue
-import android.view.View
-import android.widget.Toast
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import me.capcom.smsgateway.R
 
-class LocalServerSettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val backgroundValue = TypedValue()
-        requireContext().theme.resolveAttribute(
-            android.R.attr.colorBackground,
-            backgroundValue,
-            true
-        )
-
-        view.setBackgroundColor(backgroundValue.data)
-    }
+class LocalServerSettingsFragment : BasePreferenceFragment() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.local_server_preferences, rootKey)
@@ -86,8 +69,4 @@ class LocalServerSettingsFragment : PreferenceFragmentCompat() {
 
         super.onDisplayPreferenceDialog(preference)
     }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt b/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt
index 4c348a2..1928dc5 100644
--- a/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt
+++ b/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt
@@ -3,27 +3,11 @@ package me.capcom.smsgateway.ui.settings
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.text.InputType
-import android.util.TypedValue
-import android.view.View
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import me.capcom.smsgateway.R
 
-class MessagesSettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val backgroundValue = TypedValue()
-        requireContext().theme.resolveAttribute(
-            android.R.attr.colorBackground,
-            backgroundValue,
-            true
-        )
-
-        view.setBackgroundColor(backgroundValue.data)
-    }
+class MessagesSettingsFragment : BasePreferenceFragment() {
 
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ae750e9..dd37129 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,10 +12,33 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/viewPager"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <FrameLayout
+            android:id="@+id/progressBar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/progressBarOverlay"
+            android:clickable="true"
+            android:focusable="true"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ProgressBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:indeterminate="true" />
+        </FrameLayout>
+    </FrameLayout>
+
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..995a594 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="progressBarOverlay">#33FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 216bdd9..eb34342 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,76 +1,84 @@
 <resources>
+    <string name="address_is">%1$s</string>
+    <string name="api_url">API URL</string>
+    <string name="api_url_private_token_credentials_etc">API URL, private token, credentials, etc.</string>
     <string name="app_name">SMS Gateway</string>
-    <string name="notification_title">SMS Gateway</string>
-    <string name="tab_text_settings">SETTINGS</string>
-    <string name="tab_text_messages">MESSAGES</string>
-    <string name="settings_local_server">Local server</string>
+    <string name="app_version_build">App version (build)</string>
+    <string name="battery_optimizations_already_disabled">Battery optimizations already disabled</string>
+    <string name="battery_optimizations_not_supported_on_this_device">Battery optimizations not supported on this device</string>
+    <string name="can_affect_battery_life">can affect battery life</string>
     <string name="cloud_server">Cloud server</string>
-    <string name="settings_address_is_sms_capcom_me">api.sms-gate.app</string>
-    <string name="settings_start_on_boot">Start on boot</string>
-    <string name="settings_offline">Offline</string>
-    <string name="settings_online">Online</string>
-    <string name="settings_local_address_is">&lt;a href>%1$s:%2$d&lt;/a></string>
-    <string name="settings_public_address_is">&lt;a href>%1$s:%2$d&lt;/a></string>
+    <string name="cloud_server_dotdotdot">Cloud server…</string>
     <string name="copied_to_clipboard">Copied</string>
-    <string name="sms_gateway">SMS Gateway</string>
-    <string name="local_sms_gateway_notifications">Local SMS Gateway notifications</string>
-    <string name="sms_gateway_is_running_on_port">SMS gateway is running on port %1$d</string>
-    <string name="settings_local_address_not_found">Not available</string>
-    <string name="settings_public_address_not_found">Not available</string>
-    <string name="messages_header">Messages</string>
-    <string name="tab_text_home">Home</string>
+    <string name="delays_limits_etc">Delays, Limits, etc.</string>
+    <string name="delays_seconds">Delays, seconds</string>
+    <string name="delete_after_days">Delete after, days</string>
+    <string name="disable_battery_optimizations">Disable battery optimizations</string>
+    <string name="disabled">Disabled</string>
+    <string name="dots">…</string>
+    <string name="enabled">Enabled</string>
     <string name="encryption">Encryption</string>
-    <string name="use_empty_to_disable">Use empty to disable</string>
-    <string name="passphrase">Passphrase</string>
-    <string name="send_messages_notification">Sending messages…</string>
-    <string name="api_url">API URL</string>
-    <string name="private_token">Private Token</string>
     <string name="ignored_for_public_server">Ignored for public server</string>
-    <string name="address_is">%1$s</string>
+    <string name="information">Information</string>
+    <string name="interval_seconds">Interval (seconds)</string>
+    <string name="is_not_a_valid_port_must_be_between_1024_and_65535">%1$s is not a valid port. Must be between 1024 and 65535</string>
+    <string name="label_password">Password:</string>
+    <string name="label_username">Username:</string>
     <string name="limits">Limits</string>
-    <string name="period">Period</string>
+    <string name="list_of_last_50_log_entries">List of last 50 log entries</string>
+    <string name="local_address">Local address:</string>
+    <string name="local_server_dotdotdot">Local Server…</string>
+    <string name="local_sms_gateway_notifications">Local SMS Gateway notifications</string>
+    <string name="logs">Logs</string>
+    <string name="maximum">Maximum</string>
     <string name="messages_count">Messages count</string>
-    <string name="delays_seconds">Delays, seconds</string>
+    <string name="messages_header">Messages</string>
     <string name="minimum">Minimum</string>
-    <string name="maximum">Maximum</string>
-    <string name="set_maximum_value_to_activate">Set maximum value to activate</string>
-    <string name="information">Information</string>
-    <string name="app_version_build">App version (build)</string>
-    <string name="sending_webhook">Sending webhook…</string>
-    <string name="ping_service_is_active">Ping service is active</string>
-    <string name="delete_after_days">Delete after, days</string>
-    <string name="interval_seconds">Interval (seconds)</string>
-    <string name="online_status_at_the_cost_of_battery_life">Online status at the cost of battery
-        life</string>
+    <string name="more_settings">More settings…</string>
+    <string name="notification_title">SMS Gateway</string>
+    <string name="online_status_at_the_cost_of_battery_life">Online status at the cost of battery life</string>
+    <string name="passphrase">Passphrase</string>
+    <string name="password">Password</string>
+    <string name="password_must_be_at_least_8_characters">Password must be at least 8 characters</string>
+    <string name="period">Period</string>
     <string name="ping">Ping</string>
-    <string name="logs">Logs</string>
-    <string name="view">View</string>
-    <string name="list_of_last_50_log_entries">List of last 50 log entries</string>
-    <string name="webhooks">Webhooks</string>
-    <string name="the_webhook_request_will_wait_for_an_internet_connection">The webhook request will wait for an internet connection</string>
+    <string name="ping_service_is_active">Ping service is active</string>
+    <string name="port">Port</string>
+    <string name="port_credentials_etc">Port, credentials, etc.</string>
+    <string name="private_token">Private Token</string>
+    <string name="public_address">Public address:</string>
     <string name="require_internet_connection">Require Internet connection</string>
-    <string name="more_settings">More settings…</string>
-    <string name="delays_limits_etc">Delays, Limits, etc.</string>
     <string name="retry_count">Retry count</string>
-    <string name="local_address">Local address:</string>
-    <string name="dots">...</string>
-    <string name="public_address">Public address:</string>
-    <string name="username">Username</string>
-    <string name="password">Password</string>
-    <string name="label_username">Username:</string>
-    <string name="label_password">Password:</string>
+    <string name="send_messages_notification">Sending messages…</string>
+    <string name="sending_webhook">Sending webhook…</string>
+    <string name="server">Server</string>
     <string name="server_address">Server address:</string>
-    <string name="to_apply_the_changes_restart_the_app_using_the_button_below">To apply the changes, restart the app using the button below.</string>
+    <string name="set_maximum_value_to_activate">Set maximum value to activate</string>
+    <string name="settings_address_is_sms_capcom_me">api.sms-gate.app</string>
+    <string name="settings_local_address_is">&lt;a href>%1$s:%2$d&lt;/a></string>
+    <string name="settings_local_address_not_found">Not available</string>
+    <string name="settings_local_server">Local server</string>
+    <string name="settings_offline">Offline</string>
+    <string name="settings_online">Online</string>
+    <string name="settings_public_address_is">&lt;a href>%1$s:%2$d&lt;/a></string>
+    <string name="settings_public_address_not_found">Not available</string>
+    <string name="settings_start_on_boot">Start on boot</string>
+    <string name="sms_gateway">SMS Gateway</string>
+    <string name="sms_gateway_is_running_on_port">SMS gateway is running on port %1$d</string>
     <string name="system">System</string>
-    <string name="can_affect_battery_life">can affect battery life</string>
-    <string name="disable_battery_optimizations">Disable battery optimizations</string>
-    <string name="disabled">Disabled</string>
-    <string name="enabled">Enabled</string>
-    <string name="battery_optimizations_not_supported_on_this_device">Battery optimizations not supported on this device</string>
-    <string name="battery_optimizations_already_disabled">Battery optimizations already disabled</string>
-    <string name="server">Server</string>
-    <string name="port">Port</string>
-    <string name="password_must_be_at_least_8_characters">Password must be at least 8 characters</string>
+    <string name="tab_text_home">Home</string>
+    <string name="tab_text_messages">MESSAGES</string>
+    <string name="tab_text_settings">SETTINGS</string>
+    <string name="the_webhook_request_will_wait_for_an_internet_connection">The webhook request will wait for an internet connection</string>
+    <string name="to_apply_the_changes_restart_the_app_using_the_button_below">To apply the changes, restart the app using the button below.</string>
+    <string name="use_empty_to_disable">Use empty to disable</string>
+    <string name="username">Username</string>
     <string name="username_must_be_at_least_3_characters">Username must be at least 3 characters</string>
-    <string name="is_not_a_valid_port_must_be_between_1024_and_65535">%1$s is not a valid port. Must be between 1024 and 65535</string>
+    <string name="view">View</string>
+    <string name="webhooks">Webhooks</string>
+    <string name="invalid_url">Invalid URL</string>
+    <string name="not_set">Not set</string>
+    <string name="password_must_be_at_least_14_characters">Password must be at least 14 characters</string>
+    <string name="password_changed_successfully">Password changed successfully</string>
+    <string name="failed_to_change_password">Failed to change password: %1$s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/cloud_server_preferences.xml b/app/src/main/res/xml/cloud_server_preferences.xml
new file mode 100644
index 0000000..a4a0a27
--- /dev/null
+++ b/app/src/main/res/xml/cloud_server_preferences.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory app:title="@string/server">
+        <EditTextPreference
+            app:enableCopying="true"
+            app:icon="@drawable/ic_server"
+            app:key="gateway.cloud_url"
+            app:title="@string/api_url" />
+        <EditTextPreference
+            app:icon="@drawable/ic_token"
+            app:key="gateway.private_token"
+            app:summary="@string/ignored_for_public_server"
+            app:title="@string/private_token" />
+    </PreferenceCategory>
+    <PreferenceCategory app:title="Credentials">
+        <EditTextPreference
+            app:enableCopying="true"
+            app:icon="@drawable/ic_username"
+            app:key="gateway.username"
+            app:persistent="false"
+            app:selectable="false"
+            app:title="@string/username" />
+        <EditTextPreference
+            app:enableCopying="true"
+            app:icon="@drawable/ic_password"
+            app:key="gateway.password"
+            app:persistent="false"
+            app:title="@string/password" />
+    </PreferenceCategory>
+    <Preference app:summary="Restart required to apply changes" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index af0a43e..dbf41cd 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -2,21 +2,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
         app:fragment="me.capcom.smsgateway.ui.settings.LocalServerSettingsFragment"
-        app:summary="Port, credentials, etc."
-        app:title="Local Server..." />
-
-    <PreferenceCategory app:title="@string/cloud_server">
-        <EditTextPreference
-            app:enableCopying="true"
-            app:icon="@drawable/ic_server"
-            app:key="gateway.cloud_url"
-            app:title="@string/api_url" />
-        <EditTextPreference
-            app:icon="@drawable/ic_token"
-            app:key="gateway.private_token"
-            app:summary="@string/ignored_for_public_server"
-            app:title="@string/private_token" />
-    </PreferenceCategory>
+        app:summary="@string/port_credentials_etc"
+        app:title="@string/local_server_dotdotdot" />
+    <Preference
+        app:fragment="me.capcom.smsgateway.ui.settings.CloudServerSettingsFragment"
+        app:summary="@string/api_url_private_token_credentials_etc"
+        app:title="@string/cloud_server_dotdotdot" />
 
     <PreferenceCategory app:title="@string/encryption">
         <EditTextPreference