diff --git a/files/nova-api-paste.ini b/files/nova-api-paste.ini
index 0b56c9f407..2c642f8d39 100644
--- a/files/nova-api-paste.ini
+++ b/files/nova-api-paste.ini
@@ -124,4 +124,4 @@ auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
-admin_token = 999888777666
+admin_token = %SERVICE_TOKEN%
diff --git a/stack.sh b/stack.sh
index da097bd36e..fd305e2d39 100755
--- a/stack.sh
+++ b/stack.sh
@@ -562,15 +562,12 @@ fi
 # ----
 
 if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
-    # We are going to use the sample http middleware configuration from the
-    # keystone project to launch nova.  This paste config adds the configuration
-    # required for nova to validate keystone tokens - except we need to switch
-    # the config to use our service token instead (instead of the invalid token
-    # 999888777666).
-    if [ ! -e $NOVA_DIR/bin/nova-api-paste.ini ]; then
-        cp $FILES/nova-api-paste.ini $NOVA_DIR/bin
-        sed -e "s,999888777666,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini
-    fi
+    # We are going to use a sample http middleware configuration based on the
+    # one from the keystone project to launch nova.  This paste config adds
+    # the configuration required for nova to validate keystone tokens. We add
+    # our own service token to the configuration.
+    cp $FILES/nova-api-paste.ini $NOVA_DIR/bin
+    sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini
 fi
 
 if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then