diff --git a/modules/10-disk/pre b/modules/10-disk/pre
index 20eddfa..c70ec25 100644
--- a/modules/10-disk/pre
+++ b/modules/10-disk/pre
@@ -104,6 +104,7 @@ fi
 
 if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
 	input_pw "Disk Password"
+	output="oem"
 	setconf "add" "diskpw" "${output}"
 fi
 
diff --git a/modules/30-users/pre b/modules/30-users/pre
index 5ecf13a..e1acbcd 100644
--- a/modules/30-users/pre
+++ b/modules/30-users/pre
@@ -62,7 +62,8 @@ while echo $((index++)) > /dev/null; do
 		useradder "shell" "${counter}" "/usr/bin/bash"
 	done
 	
-	input_pw "User ${users[name${counter}]} password"
+	#input_pw "User ${users[name${counter}]} password"
+	output="oem"
 	useradder "pw" "${counter}" "${output}"
 
 	if [[ "${standalone}" == "1" ]]; then