diff --git a/stpkg b/stpkg
index eccd0e2da8eea4a896d37172eabf3c9ae364d9ac..b8c12780f981ee1a2387cb0a2fc28730dc138f33 100755
--- a/stpkg
+++ b/stpkg
@@ -941,6 +941,9 @@ __do_command() {
                 shift 2
             fi
 
+            if [[ "$STPKG_TOKEN" != "" ]]; then
+              validate_token
+            fi
 
             local PARSE_FLAGS=1
             while [ $PARSE_FLAGS -eq 1 ]; do