diff --git a/lib/swift b/lib/swift
index 5be9e35..b6c06c5 100644
--- a/lib/swift
+++ b/lib/swift
@@ -428,10 +428,11 @@
         swift_pipeline+=" s3api"
     fi
     if is_service_enabled keystone; then
+        swift_pipeline+=" authtoken"
         if is_service_enabled s3api;then
             swift_pipeline+=" s3token"
         fi
-        swift_pipeline+=" authtoken keystoneauth"
+        swift_pipeline+=" keystoneauth"
     fi
 
     swift_pipeline+=" tempauth "