diff --git a/setup/ubuntu-install.sh b/setup/ubuntu-install.sh
index c2c89763..15c62c0c 100644
--- a/setup/ubuntu-install.sh
+++ b/setup/ubuntu-install.sh
@@ -59,6 +59,8 @@ apt-get install -y curl &>/dev/null
 apt-get install -y sudo &>/dev/null
 echo -e "${CM}${CL} \r"
 
+PASS=$(grep -w "root" /etc/shadow | cut -b6);
+  if [[ $PASS != $ ]]; then
 echo -en "${GN} Customizing Container... "
 chmod -x /etc/update-motd.d/*
 touch ~/.hushlogin
@@ -72,6 +74,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