diff --git a/system/base/base-files/base-files.sysconf b/system/base/base-files/base-files.sysconf
index 4ee894ce..b0febad7 100644
--- a/system/base/base-files/base-files.sysconf
+++ b/system/base/base-files/base-files.sysconf
@@ -19,8 +19,10 @@ if [ ! -f /var/lib/ymp/sysconf/base-files/postinstall.done ]; then
     date > /var/lib/ymp/sysconf/base-files/postinstall.done
     touch /etc/passwd
 fi
-cat /etc/passwd.d/* | while read line ; do
-    if ! grep "^${line}$" /etc/passwd > /dev/null ; then
+cat /etc/passwd.d/* | sed "s/#.*//g"| while read line ; do
+    if [ -z "${line}" ] ; then
+        : skip empty line
+    elif ! grep "^${line}$" /etc/passwd > /dev/null ; then
         echo "${line}" >> /etc/passwd
     fi
 done