diff --git a/configuration.h b/configuration.h
index 7bae79ae110e..91fb05d8962b 100644
--- a/configuration.h
+++ b/configuration.h
@@ -335,7 +335,7 @@ typedef struct settings
       char location_driver[32];
       char menu_driver[32];
       char cheevos_username[32];
-      char cheevos_password[32];
+      char cheevos_password[256];
       char cheevos_token[32];
       char video_context_driver[32];
       char audio_driver[32];
diff --git a/deps/rcheevos/src/rurl/url.c b/deps/rcheevos/src/rurl/url.c
index 465d1bb2b461..6b7c4607b5e6 100644
--- a/deps/rcheevos/src/rurl/url.c
+++ b/deps/rcheevos/src/rurl/url.c
@@ -167,7 +167,7 @@ int rc_url_get_badge_image(char* buffer, size_t size, const char* badge_name) {
 
 int rc_url_login_with_password(char* buffer, size_t size, const char* user_name, const char* password) {
   char urle_user_name[64];
-  char urle_password[64];
+  char urle_password[256];
   int written;
 
   if (rc_url_encode(urle_user_name, sizeof(urle_user_name), user_name) != 0) {
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 7cb1eec75fdb..b015a4213e05 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -5252,7 +5252,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD,
-   "Input the password of your RetroAchievements account."
+   "Input the password of your RetroAchievements account. Max length: 255 characters."
    )
 
 /* Settings > User > Accounts > YouTube */