diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig
index 8acf62017..b3d0dac64 100644
--- a/templates/dart/pubspec.yaml.twig
+++ b/templates/dart/pubspec.yaml.twig
@@ -8,8 +8,8 @@ documentation: {{ spec.contactURL }}
 environment:
   sdk: '>=2.6.0 <3.0.0'
 dependencies:
-  meta: ^1.1.8
   dio: ^3.0.10
+  meta: ^1.1.8
 
 dev_dependencies:
   test:
\ No newline at end of file
diff --git a/templates/flutter/lib/client.dart.twig b/templates/flutter/lib/client.dart.twig
index f7c05955f..aaebef676 100644
--- a/templates/flutter/lib/client.dart.twig
+++ b/templates/flutter/lib/client.dart.twig
@@ -89,18 +89,8 @@ class Client {
             final Directory cookieDir = await _getCookiePath();
             cookieJar = new PersistCookieJar(dir:cookieDir.path);
             this.http.interceptors.add(CookieManager(cookieJar));
-            if(Platform.isAndroid || Platform.isIOS) {
-              PackageInfo packageInfo = await PackageInfo.fromPlatform();
-              addHeader('Origin', 'appwrite-' + type + '://' + packageInfo.packageName);
-            } else if(Platform.isLinux) {
-              addHeader('Origin', 'appwrite-linux://');
-            } else if(Platform.isMacOS) {
-              addHeader('Origin', 'appwrite-macos://');
-            } else if(Platform.isWindows) {
-              addHeader('Origin', 'appwrite-windows://');
-            } else if(Platform.isFuchsia) {
-              addHeader('Origin', 'appwrite-fuchsia://');
-            }
+            PackageInfo packageInfo = await PackageInfo.fromPlatform();
+            addHeader('Origin', 'appwrite-$type://${packageInfo.packageName ?? packageInfo.appName}');
           }else{
             // if web set httpClientAdapter as BrowserHttpClientAdapter with withCredentials true to make cookies work
             this.http.options.extra['withCredentials'] = true;
diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig
index a24034066..30b7ae84c 100644
--- a/templates/flutter/pubspec.yaml.twig
+++ b/templates/flutter/pubspec.yaml.twig
@@ -8,16 +8,16 @@ documentation: {{ spec.contactURL }}
 environment:
   sdk: '>=2.6.0 <3.0.0'
 dependencies:
-  meta: ^1.1.8
-  path_provider: ^1.6.14
-  package_info_plus: ^0.6.3
-  dio: ^3.0.10
+  flutter:
+    sdk: flutter
   cookie_jar: ^1.0.1
+  dio: ^3.0.10
   dio_cookie_manager: ^1.0.0
   flutter_web_auth: ^0.2.4
+  meta: ^1.1.8
+  package_info_plus: ^0.6.3
+  path_provider: ^1.6.14
   universal_html: ^1.2.3
-  flutter:
-    sdk: flutter
 
 dev_dependencies:
   flutter_test: