diff --git a/popup.html b/popup.html
index 0e165e0..7bad604 100644
--- a/popup.html
+++ b/popup.html
@@ -14,7 +14,7 @@
 			<form id="password-form">
 				<label for="master-password">Password</label>
 				<div class="password-container">
-					<input type="password" id="master-password" autofocus />
+					<input type="password" id="master-password" autofocus autocomplete="off" />
 					<img id="master-visibility" class="icon visibility" src="/icons/visibility.svg" />
 				</div>
 				<button>Open</button>
@@ -25,12 +25,12 @@
 			<form id="entry-form">
 				<div>
 					<label for="entry-name">Name</label>
-					<input type="text" id="entry-name" required />
+					<input type="text" id="entry-name" autocomplete="off" required />
 				</div>
 				<div>
 					<label for="entry-secret">Secret</label>
 					<div class="password-container">
-						<input type="password" id="entry-secret" required />
+						<input type="password" id="entry-secret" autocomplete="off" required />
 						<img id="entry-visibility" class="icon visibility" src="/icons/visibility.svg" />
 					</div>
 					<button><img class="icon" src="/icons/add.svg" title="Add"></button>
diff --git a/popup.js b/popup.js
index 9d9a2a4..6caccc4 100644
--- a/popup.js
+++ b/popup.js
@@ -424,7 +424,8 @@ class Entry
 		done_elt.addEventListener('click', () => {
 			this.name = name_input_elt.value
 			this.elements.title.textContent = this.name
-			this.secret = secret_input_elt.value
+			// Remove any white spaces (can happen for readability)
+			this.secret = secret_input_elt.value.replace(/\s/g, '')
 			this.regenerateKey().then(() => {
 				const count_time = Date.now() / 30000
 				const counter = Math.floor(count_time)
@@ -460,7 +461,8 @@ class Entry
 async function addEntry(event)
 {
 	event.preventDefault()
-	await store.addEntry(entry_name_elt.value, entry_secret_elt.value)
+	// Remove any white spaces (can happen for readability)
+	await store.addEntry(entry_name_elt.value, entry_secret_elt.value.replace(/\s/g, ''))
 }
 
 function start()