diff --git a/setup/homebridge-install.sh b/setup/homebridge-install.sh
index 7568ec1d..fb0b5eab 100644
--- a/setup/homebridge-install.sh
+++ b/setup/homebridge-install.sh
@@ -75,6 +75,8 @@ echo -en "${GN} Creating Homebridge Service... "
 sudo hb-service install --user homebridge &>/dev/null
 echo -e "${CM}${CL} \r"
 
+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
@@ -89,6 +91,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