diff --git a/libraries/entropy/services/client.py b/libraries/entropy/services/client.py
index b6e9c83bf..098fb78e5 100644
--- a/libraries/entropy/services/client.py
+++ b/libraries/entropy/services/client.py
@@ -765,10 +765,6 @@ class WebService(object):
             API do not match
         @raise WebService.MethodResponseError; if method execution failed
         """
-        if require_credentials:
-            # this can raise AuthenticationRequired
-            self._setup_credentials(params)
-
         # setup generic request parameters
         self._setup_generic_params(params)
 
@@ -783,6 +779,10 @@ class WebService(object):
             const_debug_write(__name__, "WebService.%s(%s) = NOT cached" % (
                 func_name, params,))
 
+        if require_credentials:
+            # this can raise AuthenticationRequired
+            self._setup_credentials(params)
+
         obj = None
         try:
             json_response, response = self._generic_post_handler(func_name,