diff --git a/src/tools/token-generator/token-generator.service.ts b/src/tools/token-generator/token-generator.service.ts
index c4a497b8..ad22628a 100644
--- a/src/tools/token-generator/token-generator.service.ts
+++ b/src/tools/token-generator/token-generator.service.ts
@@ -24,5 +24,6 @@ export function createToken({
     + (withSymbols ? '.,;:!?./-"\'#{([-|\\@)]=}*+' : '')
   )).split('').filter(c => !(deniedChars?.includes(c))).join('');
 
-  return shuffleString(allAlphabet.repeat(length)).substring(0, length);
+  const len = length < 1 ? 1 : length;
+  return shuffleString(allAlphabet.repeat(len)).substring(0, len);
 }
diff --git a/src/tools/token-generator/token-generator.tool.vue b/src/tools/token-generator/token-generator.tool.vue
index 912d1f32..3000fea6 100644
--- a/src/tools/token-generator/token-generator.tool.vue
+++ b/src/tools/token-generator/token-generator.tool.vue
@@ -14,7 +14,7 @@ const deniedChars = useQueryParamOrStorage({ name: 'deny', storageName: 'token-g
 const { t } = useI18n();
 
 const [tokens, refreshTokens] = computedRefreshable(() =>
-  Array.from({ length: count.value },
+  Array.from({ length: count.value < 1 ? 1 : count.value },
     () => createToken({
       length: length.value,
       withUppercase: withUppercase.value,
@@ -59,11 +59,12 @@ const { copy } = useCopy({ source: tokens, text: t('tools.token-generator.copied
 
       <n-form-item :label="`${t('tools.token-generator.length')} (${length})`" label-placement="left">
         <n-slider v-model:value="length" :step="1" :min="1" :max="512" mr-2 />
-        <n-input-number v-model:value="length" size="small" />
+        <n-input-number v-model:value="length" :min="1" :max="512" size="small" />
       </n-form-item>
 
       <n-form-item label="Number of token to generate" label-placement="left">
-        <n-input-number v-model:value="count" size="small" />
+        <n-slider v-model:value="count" :step="1" :min="1" mr-2 />
+        <n-input-number v-model:value="count" :min="1" size="small" />
       </n-form-item>
 
       <c-input-text