diff --git a/DysonNetwork.Drive/Startup/ApplicationBuilderExtensions.cs b/DysonNetwork.Drive/Startup/ApplicationBuilderExtensions.cs
index 698dabee..ef2896bf 100644
--- a/DysonNetwork.Drive/Startup/ApplicationBuilderExtensions.cs
+++ b/DysonNetwork.Drive/Startup/ApplicationBuilderExtensions.cs
@@ -15,7 +15,6 @@ public static class ApplicationBuilderExtensions
             app.UseSwaggerUI();
         }
 
-        app.UseHttpsRedirection();
         app.UseAuthorization();
         app.MapControllers();
         
diff --git a/DysonNetwork.Pass/Client/public/favicon.ico b/DysonNetwork.Pass/Client/public/favicon.ico
deleted file mode 100644
index df36fcfb..00000000
Binary files a/DysonNetwork.Pass/Client/public/favicon.ico and /dev/null differ
diff --git a/DysonNetwork.Pass/Client/src/router/index.ts b/DysonNetwork.Pass/Client/src/router/index.ts
index 4e83c8cd..413ea9b9 100644
--- a/DysonNetwork.Pass/Client/src/router/index.ts
+++ b/DysonNetwork.Pass/Client/src/router/index.ts
@@ -8,6 +8,11 @@ const router = createRouter({
       name: 'index',
       component: () => import('../views/index.vue'),
     },
+    {
+      path: '/captcha',
+      name: 'captcha',
+      component: () => import('../views/captcha.vue'),
+    }
   ],
 })
 
diff --git a/DysonNetwork.Pass/Client/src/views/captcha.vue b/DysonNetwork.Pass/Client/src/views/captcha.vue
new file mode 100644
index 00000000..f30d4906
--- /dev/null
+++ b/DysonNetwork.Pass/Client/src/views/captcha.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="h-full flex items-center justify-center">
+    <n-card class="max-w-lg text-center" title="Captcha">
+      <div class="flex justify-center my-4">
+        <div v-if="provider === 'cloudflare'" class="cf-turnstile" :data-sitekey="apiKey" :data-callback="onSuccess"></div>
+        <div v-else-if="provider === 'recaptcha'" class="g-recaptcha" :data-sitekey="apiKey" :data-callback="onSuccess"></div>
+        <div v-else-if="provider === 'hcaptcha'" class="h-captcha" :data-sitekey="apiKey" :data-callback="onSuccess"></div>
+        <div v-else class="alert alert-warning">
+          <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+          </svg>
+          <span>Captcha provider not configured correctly.</span>
+        </div>
+      </div>
+
+      <div class="text-sm">
+        <div class="font-semibold mb-1">Solar Network Anti-Robot</div>
+        <div class="text-base-content/70">
+          Powered by
+          <template v-if="provider === 'cloudflare'">
+            <a href="https://www.cloudflare.com/turnstile/" class="link link-hover">
+              Cloudflare Turnstile
+            </a>
+          </template>
+          <template v-else-if="provider === 'recaptcha'">
+            <a href="https://www.google.com/recaptcha/" class="link link-hover">
+              Google reCaptcha
+            </a>
+          </template>
+          <template v-else>
+            <span>Nothing</span>
+          </template>
+          <br/>
+          Hosted by
+          <a href="https://github.com/Solsynth/DysonNetwork" class="link link-hover">
+            DysonNetwork.Sphere
+          </a>
+        </div>
+      </div>
+    </n-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { NCard } from 'naive-ui';
+
+const route = useRoute();
+
+// Get provider and API key from app data
+// @ts-ignore
+const { Provider: provider, ApiKey: apiKey } = window.__APP_DATA__ || {};
+
+// Load the appropriate CAPTCHA script based on provider
+const loadCaptchaScript = () => {
+  if (!provider) return;
+
+  const script = document.createElement('script');
+  script.async = true;
+  script.defer = true;
+
+  switch (provider.toLowerCase()) {
+    case 'recaptcha':
+      script.src = 'https://www.recaptcha.net/recaptcha/api.js';
+      break;
+    case 'cloudflare':
+      script.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js';
+      break;
+    case 'hcaptcha':
+      script.src = 'https://js.hcaptcha.com/1/api.js';
+      break;
+    default:
+      return;
+  }
+
+  document.head.appendChild(script);
+};
+
+// Handle successful CAPTCHA verification
+const onSuccess = (token: string) => {
+  // Send token to parent window if in iframe
+  if (window.parent !== window) {
+    window.parent.postMessage(`captcha_tk=${token}`, '*');
+  }
+
+  // Handle redirect if redirect_uri is present
+  const redirectUri = route.query.redirect_uri as string;
+  if (redirectUri) {
+    window.location.href = `${redirectUri}?captcha_tk=${encodeURIComponent(token)}`;
+  }
+};
+
+// Load CAPTCHA script when component mounts
+onMounted(() => {
+  loadCaptchaScript();
+});
+</script>
diff --git a/DysonNetwork.Pass/DysonNetwork.Pass.csproj b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
index b2d23cc4..872b9d31 100644
--- a/DysonNetwork.Pass/DysonNetwork.Pass.csproj
+++ b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
@@ -149,6 +149,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <Folder Include="Client\public\" />
       <Folder Include="Client\src\components\" />
       <Folder Include="Client\src\stores\" />
     </ItemGroup>
diff --git a/DysonNetwork.Pass/Pages/Data/CaptchaPageData.cs b/DysonNetwork.Pass/Pages/Data/CaptchaPageData.cs
new file mode 100644
index 00000000..d9a382f0
--- /dev/null
+++ b/DysonNetwork.Pass/Pages/Data/CaptchaPageData.cs
@@ -0,0 +1,20 @@
+using DysonNetwork.Shared.PageData;
+
+namespace DysonNetwork.Pass.Pages.Data;
+
+public class CaptchaPageData(IConfiguration configuration) : IPageDataProvider
+{
+    public bool CanHandlePath(PathString path) => path == "/captcha";
+
+    public Task<IDictionary<string, object?>> GetAppDataAsync(HttpContext context)
+    {
+        var provider = configuration.GetSection("Captcha")["Provider"]?.ToLower();
+        var apiKey = configuration.GetSection("Captcha")["ApiKey"];
+        
+        return Task.FromResult<IDictionary<string, object?>>(new Dictionary<string, object?>
+        {
+            ["Provider"] = provider,
+            ["ApiKey"] = apiKey
+        });
+    }
+}
\ No newline at end of file
diff --git a/DysonNetwork.Pass/Program.cs b/DysonNetwork.Pass/Program.cs
index e571f69a..2b32e215 100644
--- a/DysonNetwork.Pass/Program.cs
+++ b/DysonNetwork.Pass/Program.cs
@@ -34,6 +34,7 @@ builder.Services.AddAppBusinessServices(builder.Configuration);
 builder.Services.AddAppScheduledJobs();
 
 builder.Services.AddTransient<IPageDataProvider, VersionPageData>();
+builder.Services.AddTransient<IPageDataProvider, CaptchaPageData>();
 
 var app = builder.Build();
 
diff --git a/DysonNetwork.Pass/Startup/ApplicationConfiguration.cs b/DysonNetwork.Pass/Startup/ApplicationConfiguration.cs
index da69c119..d9fa82ea 100644
--- a/DysonNetwork.Pass/Startup/ApplicationConfiguration.cs
+++ b/DysonNetwork.Pass/Startup/ApplicationConfiguration.cs
@@ -33,7 +33,6 @@ public static class ApplicationConfiguration
 
         app.UseWebSockets();
         app.UseRateLimiter();
-        app.UseHttpsRedirection();
         app.UseAuthentication();
         app.UseAuthorization();
         app.UseMiddleware<PermissionMiddleware>();
diff --git a/DysonNetwork.Pusher/Startup/ApplicationConfiguration.cs b/DysonNetwork.Pusher/Startup/ApplicationConfiguration.cs
index eacf9fa9..7dc3f30a 100644
--- a/DysonNetwork.Pusher/Startup/ApplicationConfiguration.cs
+++ b/DysonNetwork.Pusher/Startup/ApplicationConfiguration.cs
@@ -28,7 +28,6 @@ public static class ApplicationConfiguration
 
         app.UseWebSockets();
         app.UseRateLimiter();
-        app.UseHttpsRedirection();
         app.UseAuthentication();
         app.UseAuthorization();
 
diff --git a/DysonNetwork.Shared/Proto/GrpcClientHelper.cs b/DysonNetwork.Shared/Proto/GrpcClientHelper.cs
index 05b32135..172fe053 100644
--- a/DysonNetwork.Shared/Proto/GrpcClientHelper.cs
+++ b/DysonNetwork.Shared/Proto/GrpcClientHelper.cs
@@ -93,7 +93,7 @@ public static class GrpcClientHelper
         string? clientCertPassword = null
     )
     {
-        var url = await GetServiceUrlFromEtcd(etcdClient, "DysonNetwork.File");
+        var url = await GetServiceUrlFromEtcd(etcdClient, "DysonNetwork.Drive");
         return new FileService.FileServiceClient(CreateCallInvoker(url, clientCertPath, clientKeyPath,
             clientCertPassword));
     }
@@ -105,7 +105,7 @@ public static class GrpcClientHelper
         string? clientCertPassword = null
     )
     {
-        var url = await GetServiceUrlFromEtcd(etcdClient, "DysonNetwork.FileReference");
+        var url = await GetServiceUrlFromEtcd(etcdClient, "DysonNetwork.Drive");
         return new FileReferenceService.FileReferenceServiceClient(CreateCallInvoker(url, clientCertPath, clientKeyPath,
             clientCertPassword));
     }
diff --git a/DysonNetwork.Sphere/Startup/ApplicationConfiguration.cs b/DysonNetwork.Sphere/Startup/ApplicationConfiguration.cs
index ee62b912..32a5e2be 100644
--- a/DysonNetwork.Sphere/Startup/ApplicationConfiguration.cs
+++ b/DysonNetwork.Sphere/Startup/ApplicationConfiguration.cs
@@ -31,7 +31,6 @@ public static class ApplicationConfiguration
 
         app.UseWebSockets();
         app.UseRateLimiter();
-        app.UseHttpsRedirection();
         app.UseAuthentication();
         app.UseAuthorization();
         app.UseMiddleware<PermissionMiddleware>();