diff --git a/src/Appwrite/Utopia/Response/Filters/V06.php b/src/Appwrite/Utopia/Response/Filters/V06.php
index c1b138abe1..f83007d9d0 100644
--- a/src/Appwrite/Utopia/Response/Filters/V06.php
+++ b/src/Appwrite/Utopia/Response/Filters/V06.php
@@ -41,12 +41,18 @@ class V06 extends Filter {
             case Response::MODEL_TOKEN:
                 $parsedResponse = $this->parseToken($content); 
                 break;
+
+            case Response::MODEL_LOCALE:
+                $parsedResponse = $this->parseLocale($content);
+                break;
+
+
             case Response::MODEL_ANY :
                 $parsedResponse = $content;
                 break;
 
             default:
-                throw new Exception('Recevied invlaid model : '.$model);
+                throw new Exception('Recevied invalid model : '.$model);
         }
 
         return $parsedResponse;
@@ -57,6 +63,18 @@ class V06 extends Filter {
 
     }
 
+    private function parseLocale(array $content) 
+    {
+        $content['ip'] = empty($content['ip']) ? '' : $content['ip'];
+        $content['countryCode'] = empty($content['countryCode']) ? '--' : $content['countryCode'];
+        $content['country'] = empty($content['country']) ? Locale::getText('locale.country.unknown') : $content['country'];
+        $content['continent'] = empty($content['continent']) ? Locale::getText('locale.country.unknown') : $content['continent'];
+        $content['continentCode'] = empty($content['continentCode']) ? '--' : $content['continentCode'];
+        $content['eu'] = empty($content['eu']) ? false : $content['eu'];
+        $content['currency'] = empty($content['currency']) ? null : $content['currency'];
+        return $content;
+    }
+
     private function parseToken(array $content)
     {
         $content['type'] = Auth::TOKEN_TYPE_RECOVERY;