diff --git a/client/src/lib/Dashboard.svelte b/client/src/lib/Dashboard.svelte
index 2f2114c..3c20aa6 100644
--- a/client/src/lib/Dashboard.svelte
+++ b/client/src/lib/Dashboard.svelte
@@ -301,7 +301,7 @@
 
         {#if newSpaceType !== 'kicad' && newSpaceType !== 'blender'}
           <div class="form-group">
-            <label class="form-label" for="password">Password</label>
+            <label class="form-label" for="password">Password (min. 8 characters)</label>
             <p class="password-info">This password will be needed to access the space. Please pick a secure password, you cannot change it later.</p>
             <div class="password-input-wrapper">
               {#if showPassword}
@@ -353,7 +353,7 @@
         <button
           class="btn-primary"
           on:click={createSpace}
-          disabled={loading || (newSpaceType !== 'kicad' && newSpaceType !== 'blender' && !newSpacePassword)}
+          disabled={loading || (newSpaceType !== 'kicad' && newSpaceType !== 'blender' && (!newSpacePassword || newSpacePassword.length < 8))}
         >
           {loading ? 'Creating...' : 'Create Space'}
         </button>
diff --git a/src/utils/spaces.js b/src/utils/spaces.js
index 3cf8fdd..fdaef5c 100644
--- a/src/utils/spaces.js
+++ b/src/utils/spaces.js
@@ -64,6 +64,8 @@ export const createContainer = async (password, type, authorization) => {
     password = crypto.randomBytes(16).toString('hex');
   } else if (!password) {
     throw new Error("Missing container password");
+  } else if (password.length < 8) {
+    throw new Error("Password must be at least 8 characters long");
   }
 
   try {