diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index bc9a50415..c3c624107 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -281,10 +281,10 @@ define('ACTKEY_LENGTH', 32);
 define('SID_LENGTH', 20);
 define('LOGIN_KEY_LENGTH', 32);
 define('USERNAME_MIN_LENGTH', 3);
-define('USERNAME_MAX_LENGTH', 25);
-define('USEREMAIL_MAX_LENGTH', 40);
+define('USERNAME_MAX_LENGTH', 30);
+define('USEREMAIL_MAX_LENGTH', 50);
 define('PASSWORD_MIN_LENGTH', 8);
-define('PASSWORD_MAX_LENGTH', 24);
+define('PASSWORD_MAX_LENGTH', 128);
 
 define('PAGE_HEADER', INC_DIR . '/page_header.php');
 define('PAGE_FOOTER', INC_DIR . '/page_footer.php');