diff --git a/Containers/UserSettings/UsernameSettings/UsernameSettings.tsx b/Containers/UserSettings/UsernameSettings/UsernameSettings.tsx
index ed4c523..4e493fc 100644
--- a/Containers/UserSettings/UsernameSettings/UsernameSettings.tsx
+++ b/Containers/UserSettings/UsernameSettings/UsernameSettings.tsx
@@ -90,16 +90,16 @@ export default function UsernameSettings(props: UsernameSettingDTO) {
                     {...register('username', {
                       required: 'A username is required.',
                       pattern: {
-                        value: /^[a-z]{5,15}$/,
+                        value: /^[a-z]{1,40}$/,
                         message: 'Only a-z characters are allowed',
                       },
                       maxLength: {
-                        value: 10,
-                        message: '15 characters max.',
+                        value: 40,
+                        message: '40 characters max.',
                       },
                       minLength: {
-                        value: 5,
-                        message: '5 characters min.',
+                        value: 1,
+                        message: '1 characters min.',
                       },
                     })}
                   />
diff --git a/pages/api/v1/account/username.test.ts b/pages/api/v1/account/username.test.ts
index 66c8c59..8bab705 100644
--- a/pages/api/v1/account/username.test.ts
+++ b/pages/api/v1/account/username.test.ts
@@ -49,14 +49,14 @@ describe('PUT /api/account/updateUsername', () => {
 
     const { req, res } = createMocks({
       method: 'PUT',
-      body: { username: 'Too$hort!' },
+      body: { username: '' },
     });
 
     await handler(req, res);
 
     expect(res._getStatusCode()).toBe(422);
     expect(res._getJSONData()).toEqual({
-      message: 'Only a-z characters are allowed (5 to 15 char.)',
+      message: 'Only a-z characters are allowed (1 to 40 char.)',
     });
   });
 
diff --git a/pages/api/v1/account/username.ts b/pages/api/v1/account/username.ts
index 3d1ffaf..354b6cd 100644
--- a/pages/api/v1/account/username.ts
+++ b/pages/api/v1/account/username.ts
@@ -24,10 +24,10 @@ export default async function handler(
   if (typeof username !== 'string') {
     return res.status(422).json({ message: 'Unexpected data' });
   }
-  const usernameRegex = new RegExp(/^[a-z]{5,15}$/);
+  const usernameRegex = new RegExp(/^[a-z]{1,40}$/);
   if (!usernameRegex.test(username)) {
     res.status(422).json({
-      message: 'Only a-z characters are allowed (5 to 15 char.)',
+      message: 'Only a-z characters are allowed (1 to 40 char.)',
     });
     return;
   }