diff --git a/src/main/java/id/co/anaheim/gateway/span/services/HttpClientService.java b/src/main/java/id/co/anaheim/gateway/span/services/HttpClientService.java
index bfc9f07..26b9ee8 100644
--- a/src/main/java/id/co/anaheim/gateway/span/services/HttpClientService.java
+++ b/src/main/java/id/co/anaheim/gateway/span/services/HttpClientService.java
@@ -51,7 +51,9 @@ public class HttpClientService {
                 String authorizationHeader = request.headers().header("Authorization").get(0);
                 String token = authorizationHeader.substring(7);
                 String staticToken = jwtService.extractStaticToken(token);
-                boundRequestBuilder.addHeader("token", staticToken);
+                if (!staticToken.equals("admin")) {
+                    boundRequestBuilder.addHeader("token", staticToken);
+                }
             }
             Future<Response> whenResponse = boundRequestBuilder
                     .execute();
diff --git a/src/main/java/id/co/anaheim/gateway/span/services/JwtService.java b/src/main/java/id/co/anaheim/gateway/span/services/JwtService.java
index f1eae05..178b688 100644
--- a/src/main/java/id/co/anaheim/gateway/span/services/JwtService.java
+++ b/src/main/java/id/co/anaheim/gateway/span/services/JwtService.java
@@ -50,11 +50,16 @@ public class JwtService {
             String responseBody = response.getResponseBody();
             Gson gson = new Gson();
             StaticToken staticToken = gson.fromJson(responseBody, StaticToken.class);
-            claims.put("token", staticToken.getToken());
+            if (staticToken != null) {
+                claims.put("token", staticToken.getToken());
+            } else {
+                claims.put("token", "admin");
+            }
         } catch (IOException | ExecutionException | InterruptedException e) {
+            claims.put("token", "admin");
             log.error("error get token", e);
         }
-
+        log.info("here");
         return createToken(claims, user.getUsername());
     }
 
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index fa66422..ca6c4a9 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -4,12 +4,12 @@ server:
 
 spring:
   datasource:
-    #url: jdbc:oracle:thin:@//10.216.100.100:1521/pdbsoadev
-    url: jdbc:oracle:thin:@localhost:1521:oracle
-    #username: gateway
+    url: jdbc:oracle:thin:@//10.216.100.100:1521/pdbsoadev
+    #url: jdbc:oracle:thin:@localhost:1521:oracle
     username: gateway
-    #password: welcome1
-    password: gateway
+    #username: gateway
+    password: welcome1
+    #password: gateway
   cloud:
     gateway:
       mvc:
@@ -26,8 +26,8 @@ spring:
 app:
   gateway:
     remote-servers:
-      #pan: http://10.216.99.101:8002
-      span: https://672fbf9066e42ceaf15e9a9b.mockapi.io
+      span: http://10.216.99.101:8002
+      #span: https://672fbf9066e42ceaf15e9a9b.mockapi.io
       users: http://localhost:8989
       #users: http://localhost:8779
       token: http://localhost:8787