diff --git a/app/(auth)/(tabs)/(search)/index.tsx b/app/(auth)/(tabs)/(search)/index.tsx
index e01602a3..11a38636 100644
--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -209,7 +209,12 @@ export default function search() {
           paddingRight: insets.right,
         }}
       >
-        <View className="flex flex-col">
+        <View
+          className="flex flex-col"
+          style={{
+            marginTop: Platform.OS === "android" ? 16 : 0,
+          }}
+        >
           {jellyseerrApi && (
             <View className="flex flex-row flex-wrap space-x-2 px-4 mb-2">
               <TouchableOpacity onPress={() => setSearchType("Library")}>
diff --git a/app/login.tsx b/app/login.tsx
index 9e954613..813b84d9 100644
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -317,7 +317,9 @@ const Login: React.FC = () => {
                 <Button
                   loading={loadingServerCheck}
                   disabled={loadingServerCheck}
-                  onPress={async () => await handleConnect(serverURL)}
+                  onPress={async () => {
+                    await handleConnect(serverURL);
+                  }}
                   className="w-full grow"
                 >
                   {t("server.connect_button")}
diff --git a/components/settings/Jellyseerr.tsx b/components/settings/Jellyseerr.tsx
index 5f0afdc5..e612c125 100644
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -26,9 +26,6 @@ export const JellyseerrSettings = () => {
   const [user] = useAtom(userAtom);
   const [settings, updateSettings, pluginSettings] = useSettings();
 
-  const [promptForJellyseerrPass, setPromptForJellyseerrPass] =
-    useState<boolean>(false);
-
   const [jellyseerrPassword, setJellyseerrPassword] = useState<
     string | undefined
   >(undefined);
@@ -39,10 +36,22 @@ export const JellyseerrSettings = () => {
 
   const loginToJellyseerrMutation = useMutation({
     mutationFn: async () => {
-      if (!jellyseerrServerUrl || !user?.Name || !jellyseerrPassword) {
+      if (!jellyseerrServerUrl && !settings?.jellyseerrServerUrl) {
+        throw new Error("Missing server url");
+      }
+
+      if (!user?.Name || !jellyseerrPassword) {
         throw new Error("Missing required information for login");
       }
-      const jellyseerrTempApi = new JellyseerrApi(jellyseerrServerUrl);
+      const jellyseerrTempApi = new JellyseerrApi(
+        jellyseerrServerUrl || settings.jellyseerrServerUrl || ""
+      );
+      const testResult = await jellyseerrTempApi.test();
+
+      if (!testResult.isValid) {
+        throw new Error("Invalid server url");
+      }
+
       return jellyseerrTempApi.login(user.Name, jellyseerrPassword);
     },
     onSuccess: (user) => {
@@ -57,31 +66,11 @@ export const JellyseerrSettings = () => {
     },
   });
 
-  const testJellyseerrServerUrlMutation = useMutation({
-    mutationFn: async () => {
-      if (!jellyseerrServerUrl || jellyseerrApi) return null;
-      const jellyseerrTempApi = new JellyseerrApi(jellyseerrServerUrl);
-      return jellyseerrTempApi.test();
-    },
-    onSuccess: (result) => {
-      if (result && result.isValid) {
-        if (result.requiresPass) {
-          setPromptForJellyseerrPass(true);
-        } else {
-          updateSettings({ jellyseerrServerUrl });
-        }
-      } else {
-        setPromptForJellyseerrPass(false);
-        setjellyseerrServerUrl(undefined);
-        clearAllJellyseerData();
-      }
-    },
-  });
-
   const clearData = () => {
     clearAllJellyseerData().finally(() => {
+      setJellyseerrUser(undefined);
+      setJellyseerrPassword(undefined);
       setjellyseerrServerUrl(undefined);
-      setPromptForJellyseerrPass(false);
     });
   };
 
@@ -92,34 +81,46 @@ export const JellyseerrSettings = () => {
           <>
             <ListGroup title={"Jellyseerr"}>
               <ListItem
-                title={t("home.settings.plugins.jellyseerr.total_media_requests")}
+                title={t(
+                  "home.settings.plugins.jellyseerr.total_media_requests"
+                )}
                 value={jellyseerrUser?.requestCount?.toString()}
               />
               <ListItem
                 title={t("home.settings.plugins.jellyseerr.movie_quota_limit")}
                 value={
-                  jellyseerrUser?.movieQuotaLimit?.toString() ?? t("home.settings.plugins.jellyseerr.unlimited")
+                  jellyseerrUser?.movieQuotaLimit?.toString() ??
+                  t("home.settings.plugins.jellyseerr.unlimited")
                 }
               />
               <ListItem
                 title={t("home.settings.plugins.jellyseerr.movie_quota_days")}
                 value={
-                  jellyseerrUser?.movieQuotaDays?.toString() ?? t("home.settings.plugins.jellyseerr.unlimited")
+                  jellyseerrUser?.movieQuotaDays?.toString() ??
+                  t("home.settings.plugins.jellyseerr.unlimited")
                 }
               />
               <ListItem
                 title={t("home.settings.plugins.jellyseerr.tv_quota_limit")}
-                value={jellyseerrUser?.tvQuotaLimit?.toString() ?? t("home.settings.plugins.jellyseerr.unlimited")}
+                value={
+                  jellyseerrUser?.tvQuotaLimit?.toString() ??
+                  t("home.settings.plugins.jellyseerr.unlimited")
+                }
               />
               <ListItem
                 title={t("home.settings.plugins.jellyseerr.tv_quota_days")}
-                value={jellyseerrUser?.tvQuotaDays?.toString() ?? t("home.settings.plugins.jellyseerr.unlimited")}
+                value={
+                  jellyseerrUser?.tvQuotaDays?.toString() ??
+                  t("home.settings.plugins.jellyseerr.unlimited")
+                }
               />
             </ListGroup>
 
             <View className="p-4">
               <Button color="red" onPress={clearData}>
-                {t("home.settings.plugins.jellyseerr.reset_jellyseerr_config_button")}
+                {t(
+                  "home.settings.plugins.jellyseerr.reset_jellyseerr_config_button"
+                )}
               </Button>
             </View>
           </>
@@ -128,14 +129,19 @@ export const JellyseerrSettings = () => {
             <Text className="text-xs text-red-600 mb-2">
               {t("home.settings.plugins.jellyseerr.jellyseerr_warning")}
             </Text>
-            <Text className="font-bold mb-1">{t("home.settings.plugins.jellyseerr.server_url")}</Text>
+            <Text className="font-bold mb-1">
+              {t("home.settings.plugins.jellyseerr.server_url")}
+            </Text>
             <View className="flex flex-col shrink mb-2">
               <Text className="text-xs text-gray-600">
                 {t("home.settings.plugins.jellyseerr.server_url_hint")}
               </Text>
             </View>
             <Input
-              placeholder={t("home.settings.plugins.jellyseerr.server_url_placeholder")}
+              className="border border-neutral-800 mb-2"
+              placeholder={t(
+                "home.settings.plugins.jellyseerr.server_url_placeholder"
+              )}
               value={settings?.jellyseerrServerUrl ?? jellyseerrServerUrl}
               defaultValue={
                 settings?.jellyseerrServerUrl ?? jellyseerrServerUrl
@@ -145,40 +151,20 @@ export const JellyseerrSettings = () => {
               autoCapitalize="none"
               textContentType="URL"
               onChangeText={setjellyseerrServerUrl}
-              editable={!testJellyseerrServerUrlMutation.isPending}
+              editable={!loginToJellyseerrMutation.isPending}
             />
-
-            <Button
-              loading={testJellyseerrServerUrlMutation.isPending}
-              disabled={testJellyseerrServerUrlMutation.isPending}
-              color={promptForJellyseerrPass ? "red" : "purple"}
-              className="h-12 mt-2"
-              onPress={() => {
-                if (promptForJellyseerrPass) {
-                  clearData();
-                  return;
-                }
-
-                testJellyseerrServerUrlMutation.mutate();
-              }}
-              style={{
-                marginBottom: 8,
-              }}
-            >
-              {promptForJellyseerrPass ? t("home.settings.plugins.jellyseerr.clear_button") : t("home.settings.plugins.jellyseerr.save_button")}
-            </Button>
-
-            <View
-              pointerEvents={promptForJellyseerrPass ? "auto" : "none"}
-              style={{
-                opacity: promptForJellyseerrPass ? 1 : 0.5,
-              }}
-            >
-              <Text className="font-bold mb-2">{t("home.settings.plugins.jellyseerr.password")}</Text>
+            <View>
+              <Text className="font-bold mb-2">
+                {t("home.settings.plugins.jellyseerr.password")}
+              </Text>
               <Input
+                className="border border-neutral-800"
                 autoFocus={true}
                 focusable={true}
-                placeholder={t("home.settings.plugins.jellyseerr.password_placeholder", {username: user?.Name})}
+                placeholder={t(
+                  "home.settings.plugins.jellyseerr.password_placeholder",
+                  { username: user?.Name }
+                )}
                 value={jellyseerrPassword}
                 keyboardType="default"
                 secureTextEntry={true}
@@ -186,10 +172,7 @@ export const JellyseerrSettings = () => {
                 autoCapitalize="none"
                 textContentType="password"
                 onChangeText={setJellyseerrPassword}
-                editable={
-                  !loginToJellyseerrMutation.isPending &&
-                  promptForJellyseerrPass
-                }
+                editable={!loginToJellyseerrMutation.isPending}
               />
               <Button
                 loading={loginToJellyseerrMutation.isPending}