diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs
index 2dfd7cf98..1c99db2be 100644
--- a/bindings/matrix-sdk-ffi/src/client.rs
+++ b/bindings/matrix-sdk-ffi/src/client.rs
@@ -10,7 +10,7 @@ use matrix_sdk::{
                 ClientMetadata, ClientMetadataVerificationError, VerifiedClientMetadata,
             },
         },
-        FullSession, RegisteredClientData,
+        FullSession, OidcAccountManagementAction, RegisteredClientData,
     },
     ruma::{
         api::client::{
@@ -430,8 +430,17 @@ impl Client {
         })
     }
 
-    pub fn account_url(&self) -> Option<String> {
-        self.inner.oidc().account_management_url(None).ok().flatten().map(|url| url.to_string())
+    pub fn account_url(
+        &self,
+        action: Option<AccountManagementAction>,
+    ) -> Result<Option<String>, ClientError> {
+        match self.inner.oidc().account_management_url(action.map(Into::into)) {
+            Ok(url) => Ok(url.map(|u| u.to_string())),
+            Err(e) => {
+                tracing::error!("Failed retrieving account management URL: {e}");
+                Err(e.into())
+            }
+        }
     }
 
     pub fn user_id(&self) -> Result<String, ClientError> {
@@ -969,6 +978,29 @@ impl OidcUnvalidatedSessionData {
     }
 }
 
+#[derive(uniffi::Enum)]
+pub enum AccountManagementAction {
+    Profile,
+    SessionsList,
+    SessionView { device_id: String },
+    SessionEnd { device_id: String },
+}
+
+impl From<AccountManagementAction> for OidcAccountManagementAction {
+    fn from(value: AccountManagementAction) -> Self {
+        match value {
+            AccountManagementAction::Profile => Self::Profile,
+            AccountManagementAction::SessionsList => Self::SessionsList,
+            AccountManagementAction::SessionView { device_id } => {
+                Self::SessionView { device_id: device_id.into() }
+            }
+            AccountManagementAction::SessionEnd { device_id } => {
+                Self::SessionEnd { device_id: device_id.into() }
+            }
+        }
+    }
+}
+
 #[uniffi::export]
 fn gen_transaction_id() -> String {
     TransactionId::new().to_string()