diff --git a/matrixgw_backend/src/matrix_connection/matrix_client.rs b/matrixgw_backend/src/matrix_connection/matrix_client.rs
index e2b636b..b147ad7 100644
--- a/matrixgw_backend/src/matrix_connection/matrix_client.rs
+++ b/matrixgw_backend/src/matrix_connection/matrix_client.rs
@@ -3,15 +3,13 @@ use crate::matrix_connection::matrix_manager::MatrixManagerMsg;
 use crate::users::UserEmail;
 use crate::utils::rand_utils::rand_string;
 use anyhow::Context;
-use matrix_sdk::authentication::oauth::error::{
-    BasicErrorResponseType, OAuthDiscoveryError, RequestTokenError,
-};
+use matrix_sdk::authentication::oauth::error::OAuthDiscoveryError;
 use matrix_sdk::authentication::oauth::{
     ClientId, OAuthError, OAuthSession, UrlOrQuery, UserSession,
 };
 use matrix_sdk::encryption::recovery::RecoveryState;
 use matrix_sdk::ruma::serde::Raw;
-use matrix_sdk::{Client, ClientBuildError, RefreshTokenError};
+use matrix_sdk::{Client, ClientBuildError};
 use ractor::ActorRef;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -161,20 +159,6 @@ impl MatrixClient {
                 .encryption()
                 .wait_for_e2ee_initialization_tasks()
                 .await;
-
-            // Force token refresh to make sure session is still alive, otherwise disconnect user
-            if let Err(refresh_error) = client.client.oauth().refresh_access_token().await {
-                if let RefreshTokenError::OAuth(e) = &refresh_error
-                    && let OAuthError::RefreshToken(RequestTokenError::ServerResponse(e)) = &**e
-                    && e.error() == &BasicErrorResponseType::InvalidGrant
-                {
-                    log::warn!(
-                        "Refresh token rejected by server, token must have been invalidated! {refresh_error}"
-                    );
-                } else {
-                    log::warn!("Failed to refresh token! {refresh_error}");
-                }
-            }
         }
 
         // Automatically save session when token gets refreshed
diff --git a/matrixgw_backend/src/users.rs b/matrixgw_backend/src/users.rs
index 1ac5253..ad1e410 100644
--- a/matrixgw_backend/src/users.rs
+++ b/matrixgw_backend/src/users.rs
@@ -116,14 +116,14 @@ pub struct BaseAPIToken {
     /// Restricted API network for token
     pub networks: Option<Vec<ipnet::IpNet>>,
 
-    /// Read only access
-    pub read_only: bool,
-
     /// Token max inactivity
     pub max_inactivity: u32,
 
     /// Token expiration
     pub expiration: Option<u64>,
+
+    /// Read only access
+    pub read_only: bool,
 }
 
 impl BaseAPIToken {