diff --git a/scripts/system/etc/gdm3/PostSession/Default b/scripts/system/etc/gdm3/PostSession/Default
index bec2d4b1..21aba95d 100755
--- a/scripts/system/etc/gdm3/PostSession/Default
+++ b/scripts/system/etc/gdm3/PostSession/Default
@@ -16,7 +16,7 @@ PS4='-\D{%F %T} '
 # Print commands and their arguments as they are executed.
 set -x
 
-passwd -d $USER
+passwd -d "$USER" ||:
 systemctl stop user@1000.service
 
 # Make sure the mountpoints are free