diff --git a/setup/homeassistant-install.sh b/setup/homeassistant-install.sh
index d7aa94b2..820c5185 100644
--- a/setup/homeassistant-install.sh
+++ b/setup/homeassistant-install.sh
@@ -291,6 +291,8 @@ EOF
 sudo chmod +x /root/update-containers.sh
 echo -e "${CM}${CL} \r"
 mkdir /root/hass_config
+PASS=$(grep -w "root" /etc/shadow | cut -b6);
+  if [[ $PASS != $ ]]; then
 echo -en "${GN} Customizing Container... "
 rm /etc/motd
 rm /etc/update-motd.d/10-uname
@@ -305,6 +307,7 @@ EOF
 systemctl daemon-reload
 systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
 echo -e "${CM}${CL} \r"
+  fi
 
 echo -en "${GN} Cleanup... "
 apt-get autoremove >/dev/null