diff --git a/steam_deploy.sh b/steam_deploy.sh
index d4ec8f0..f66a982 100755
--- a/steam_deploy.sh
+++ b/steam_deploy.sh
@@ -132,30 +132,33 @@ else
   echo ""
 fi
 
-echo ""
-echo "#################################"
-echo "#        Test login             #"
-echo "#################################"
-echo ""
+# Only run test login if not using TOTP (which is marked as INVALID)
+if [ "$steam_totp" == "INVALID" ]; then
+  echo ""
+  echo "#################################"
+  echo "#        Test login             #"
+  echo "#################################"
+  echo ""
 
-steamcmd +set_steam_guard_code "$steam_totp" +login "$steam_username" +quit;
+  steamcmd +set_steam_guard_code "$steam_totp" +login "$steam_username" +quit;
 
-ret=$?
-if [ $ret -eq 0 ]; then
-    echo ""
-    echo "#################################"
-    echo "#        Successful login       #"
-    echo "#################################"
-    echo ""
-else
+  ret=$?
+  if [ $ret -eq 0 ]; then
       echo ""
       echo "#################################"
-      echo "#        FAILED login           #"
+      echo "#        Successful login       #"
       echo "#################################"
       echo ""
-      echo "Exit code: $ret"
-
-      exit $ret
+  else
+        echo ""
+        echo "#################################"
+        echo "#        FAILED login           #"
+        echo "#################################"
+        echo ""
+        echo "Exit code: $ret"
+
+        exit $ret
+  fi
 fi
 
 echo ""
@@ -164,7 +167,9 @@ echo "#        Uploading build        #"
 echo "#################################"
 echo ""
 
-steamcmd +login "$steam_username" +run_app_build "$manifest_path" +quit || (
+if [ "$steam_totp" != "INVALID" ]; then
+    echo "Using TOTP for login"
+    steamcmd +set_steam_guard_code "$steam_totp" +login "$steam_username" +run_app_build "$manifest_path" +quit || (
     echo ""
     echo "#################################"
     echo "#             Errors            #"
@@ -211,5 +216,55 @@ steamcmd +login "$steam_username" +run_app_build "$manifest_path" +quit || (
 
     exit 1
   )
+else
+    echo "Using standard login"
+    steamcmd +login "$steam_username" +run_app_build "$manifest_path" +quit || (
+    echo ""
+    echo "#################################"
+    echo "#             Errors            #"
+    echo "#################################"
+    echo ""
+    echo "Listing current folder and rootpath"
+    echo ""
+    ls -alh
+    echo ""
+    ls -alh "$rootPath" || true
+    echo ""
+    echo "Listing logs folder:"
+    echo ""
+    ls -Ralph "$steamdir/logs/"
+
+    for f in "$steamdir"/logs/*; do
+      if [ -e "$f" ]; then
+        echo "######## $f"
+        cat "$f"
+        echo
+      fi
+    done
+
+    echo ""
+    echo "Displaying error log"
+    echo ""
+    cat "$steamdir/logs/stderr.txt"
+    echo ""
+    echo "Displaying bootstrapper log"
+    echo ""
+    cat "$steamdir/logs/bootstrap_log.txt"
+    echo ""
+    echo "#################################"
+    echo "#             Output            #"
+    echo "#################################"
+    echo ""
+    ls -Ralph BuildOutput
+
+    for f in BuildOutput/*.log; do
+      echo "######## $f"
+      cat "$f"
+      echo
+    done
+
+    exit 1
+  )
+fi
 
 echo "manifest=${manifest_path}" >> $GITHUB_OUTPUT