diff --git a/install/npmplus-install.sh b/install/npmplus-install.sh
index 101f7211e..d8a4be573 100644
--- a/install/npmplus-install.sh
+++ b/install/npmplus-install.sh
@@ -90,7 +90,7 @@ customize
 msg_info "Retrieving Default Login (Patience)"
 PASSWORD_FOUND=0
 for i in {1..60}; do
-    PASSWORD_LINE=$(docker logs "$CONTAINER_ID" 2>&1 | awk '/Creating a new user:/ { print; exit }')
+    PASSWORD_LINE=$(docker logs npmplus 2>&1 | awk '/Creating a new user:/ { print; exit }')
     if [[ -n "$PASSWORD_LINE" ]]; then
         PASSWORD=$(echo "$PASSWORD_LINE" | awk -F 'password: ' '{print $2}')
         echo -e "username: admin@example.org\npassword: $PASSWORD" >/opt/.npm_pwd
@@ -103,5 +103,5 @@ done
 
 if [[ $PASSWORD_FOUND -eq 0 ]]; then
     msg_error "Could not retrieve default login after 60 seconds."
-    echo -e "\nYou can manually check the container logs with:\n  docker logs $CONTAINER_ID | grep 'Creating a new user:'\n"
+    echo -e "\nYou can manually check the container logs with:\n  docker logs npmplus | grep 'Creating a new user:'\n"
 fi