diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java
index ec5e7226dc..a119822f0d 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java
@@ -31,7 +31,7 @@ public static final char[] toApplicationToken(char[] token) {
     }
     
     public static final String toRestToken(String token) {
-        return isApplicationToken(token) ? encode(token) : token; 
+        return isApplicationToken(token) ? encode(token) : validateRestTokenFormat(token); 
     }
     
     public static final char[] toRestToken(char[] token) {
@@ -53,6 +53,11 @@ private static final String validateApplicationTokenFormat(String token) {
         return token;
     }
     
+    private static final String validateRestTokenFormat(String token) {
+        decode(token);
+        return token;
+    }
+    
     private static final String encode(String token) {
         return Base64.encodeBase64String(token.getBytes(StandardCharsets.UTF_8));
     }