diff --git a/src/app/[orgId]/settings/access/roles/components/CreateRoleForm.tsx b/src/app/[orgId]/settings/access/roles/components/CreateRoleForm.tsx
index 76b2491..cb6b909 100644
--- a/src/app/[orgId]/settings/access/roles/components/CreateRoleForm.tsx
+++ b/src/app/[orgId]/settings/access/roles/components/CreateRoleForm.tsx
@@ -126,7 +126,7 @@ export default function CreateRoleForm({
                         <Form {...form}>
                             <form
                                 onSubmit={form.handleSubmit(onSubmit)}
-                                className="space-y-8"
+                                className="space-y-4"
                                 id="create-role-form"
                             >
                                 <FormField
diff --git a/src/app/[orgId]/settings/access/roles/components/DeleteRoleForm.tsx b/src/app/[orgId]/settings/access/roles/components/DeleteRoleForm.tsx
index fb946c1..bc1eb94 100644
--- a/src/app/[orgId]/settings/access/roles/components/DeleteRoleForm.tsx
+++ b/src/app/[orgId]/settings/access/roles/components/DeleteRoleForm.tsx
@@ -173,7 +173,7 @@ export default function DeleteRoleForm({
                             <Form {...form}>
                                 <form
                                     onSubmit={form.handleSubmit(onSubmit)}
-                                    className="space-y-8"
+                                    className="space-y-4"
                                     id="remove-role-form"
                                 >
                                     <FormField
diff --git a/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx b/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
index a89271f..aae7649 100644
--- a/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
+++ b/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
@@ -123,7 +123,7 @@ export default function AccessControlsPage() {
                 <Form {...form}>
                     <form
                         onSubmit={form.handleSubmit(onSubmit)}
-                        className="space-y-8"
+                        className="space-y-4"
                     >
                         <FormField
                             control={form.control}
diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx
index 0e9635f..e2b1f1f 100644
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -54,18 +54,16 @@ export default function GeneralPage() {
     });
 
     async function deleteOrg() {
-        await api
-            .delete(`/org/${org?.org.orgId}`)
-            .catch((e) => {
-                toast({
-                    variant: "destructive",
-                    title: "Failed to delete org",
-                    description: formatAxiosError(
-                        e,
-                        "An error occurred while deleting the org."
-                    ),
-                });
+        await api.delete(`/org/${org?.org.orgId}`).catch((e) => {
+            toast({
+                variant: "destructive",
+                title: "Failed to delete org",
+                description: formatAxiosError(
+                    e,
+                    "An error occurred while deleting the org."
+                )
             });
+        });
     }
 
     async function onSubmit(data: GeneralFormValues) {
@@ -109,61 +107,63 @@ export default function GeneralPage() {
                         </p>
                     </div>
                 }
-                buttonText="Confirm delete organization"
+                buttonText="Confirm Delete Organization"
                 onConfirm={deleteOrg}
                 string={org?.org.name || ""}
-                title="Delete organization"
+                title="Delete Organization"
             />
 
-            <Form {...form}>
-                <form
-                    onSubmit={form.handleSubmit(onSubmit)}
-                    className="space-y-8 max-w-lg"
-                >
-                    <FormField
-                        control={form.control}
-                        name="name"
-                        render={({ field }) => (
-                            <FormItem>
-                                <FormLabel>Name</FormLabel>
-                                <FormControl>
-                                    <Input {...field} />
-                                </FormControl>
-                                <FormDescription>
-                                    This is the display name of the org
-                                </FormDescription>
-                                <FormMessage />
-                            </FormItem>
-                        )}
-                    />
-                    <Button type="submit">Save Changes</Button>
-                </form>
-            </Form>
-
-            <Card className="max-w-lg border-red-900 mt-5">
-                <CardHeader>
-                    <CardTitle className="flex items-center gap-2 text-red-600">
-                        <AlertTriangle className="h-5 w-5" />
-                        Danger Zone
-                    </CardTitle>
-                </CardHeader>
-                <CardContent>
-                    <p className="text-sm mb-4">
-                        Once you delete this org, there is no going back. Please
-                        be certain.
-                    </p>
-                </CardContent>
-                <CardFooter className="flex justify-end gap-2">
-                    <Button
-                        variant="destructive"
-                        onClick={() => setIsDeleteModalOpen(true)}
-                        className="flex items-center gap-2"
+            <section className="space-y-8 max-w-lg">
+                <Form {...form}>
+                    <form
+                        onSubmit={form.handleSubmit(onSubmit)}
+                        className="space-y-4"
                     >
-                        <Trash2 className="h-4 w-4" />
-                        Delete
-                    </Button>
-                </CardFooter>
-            </Card>
+                        <FormField
+                            control={form.control}
+                            name="name"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>Name</FormLabel>
+                                    <FormControl>
+                                        <Input {...field} />
+                                    </FormControl>
+                                    <FormDescription>
+                                        This is the display name of the org
+                                    </FormDescription>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                        <Button type="submit">Save Changes</Button>
+                    </form>
+                </Form>
+
+                <Card className="border-red-900">
+                    <CardHeader>
+                        <CardTitle className="flex items-center gap-2 text-red-600">
+                            <AlertTriangle className="h-5 w-5" />
+                            Danger Zone
+                        </CardTitle>
+                    </CardHeader>
+                    <CardContent>
+                        <p className="text-sm">
+                            Once you delete this org, there is no going back.
+                            Please be certain.
+                        </p>
+                    </CardContent>
+                    <CardFooter className="flex justify-end gap-2">
+                        <Button
+                            variant="destructive"
+                            onClick={() => setIsDeleteModalOpen(true)}
+                            className="flex items-center gap-2"
+                        >
+                            <Trash2 className="h-4 w-4" />
+                            Delete Organization Data
+                        </Button>
+                    </CardFooter>
+                </Card>
+            </section>
         </>
     );
 }
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
index c9821a7..4104103 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx
@@ -412,7 +412,7 @@ export default function ResourceAuthenticationPage() {
                             onSubmit={usersRolesForm.handleSubmit(
                                 onSubmitUsersRoles
                             )}
-                            className="space-y-8"
+                            className="space-y-4"
                         >
                             <FormField
                                 control={usersRolesForm.control}
@@ -639,7 +639,7 @@ export default function ResourceAuthenticationPage() {
 
                             {whitelistEnabled && (
                                 <Form {...whitelistForm}>
-                                    <form className="space-y-8">
+                                    <form className="space-y-4">
                                         <FormField
                                             control={whitelistForm.control}
                                             name="emails"
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
index 1c68842..441fdae 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
@@ -132,8 +132,8 @@ export default function ReverseProxyTargets(props: {
     async function addTarget(data: AddTargetFormValues) {
         // Check if target with same IP, port and method already exists
         const isDuplicate = targets.some(
-            target => target.ip === data.ip && 
-                     target.port === data.port && 
+            target => target.ip === data.ip &&
+                     target.port === data.port &&
                      target.method === data.method
         );
 
@@ -157,7 +157,7 @@ export default function ReverseProxyTargets(props: {
         setTargets([...targets, newTarget]);
         addTargetForm.reset();
     }
-    
+
     const removeTarget = (targetId: number) => {
         setTargets([
             ...targets.filter((target) => target.targetId !== targetId),
@@ -400,7 +400,7 @@ export default function ReverseProxyTargets(props: {
                                 onSubmit={addTargetForm.handleSubmit(
                                     addTarget as any,
                                 )}
-                                className="space-y-8"
+                                className="space-y-4"
                             >
                                 <div className="grid grid-cols-2 md:grid-cols-3 gap-4">
                                     <FormField
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
index f0301aa..fd32e98 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx
@@ -135,7 +135,7 @@ export default function GeneralForm() {
                     <Form {...form}>
                         <form
                             onSubmit={form.handleSubmit(onSubmit)}
-                            className="space-y-8"
+                            className="space-y-4"
                         >
                             <FormField
                                 control={form.control}
diff --git a/src/app/[orgId]/settings/share-links/components/CreateShareLinkForm.tsx b/src/app/[orgId]/settings/share-links/components/CreateShareLinkForm.tsx
index b94e14f..475fb1a 100644
--- a/src/app/[orgId]/settings/share-links/components/CreateShareLinkForm.tsx
+++ b/src/app/[orgId]/settings/share-links/components/CreateShareLinkForm.tsx
@@ -232,7 +232,7 @@ export default function CreateShareLinkForm({
                         </CredenzaDescription>
                     </CredenzaHeader>
                     <CredenzaBody>
-                        <div className="space-y-8">
+                        <div className="space-y-4">
                             {!link && (
                                 <Form {...form}>
                                     <form
diff --git a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
index d00bb6f..d284982 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -77,7 +77,7 @@ export default function GeneralPage() {
                 <Form {...form}>
                     <form
                         onSubmit={form.handleSubmit(onSubmit)}
-                        className="space-y-8"
+                        className="space-y-4"
                     >
                         <FormField
                             control={form.control}
diff --git a/src/app/[orgId]/settings/sites/components/CreateSiteForm.tsx b/src/app/[orgId]/settings/sites/components/CreateSiteForm.tsx
index 6a5d3c1..f8957b6 100644
--- a/src/app/[orgId]/settings/sites/components/CreateSiteForm.tsx
+++ b/src/app/[orgId]/settings/sites/components/CreateSiteForm.tsx
@@ -203,7 +203,7 @@ PersistentKeepalive = 5`
             <Form {...form}>
                 <form
                     onSubmit={form.handleSubmit(onSubmit)}
-                    className="space-y-8"
+                    className="space-y-4"
                     id="create-site-form"
                 >
                     <FormField
diff --git a/src/app/auth/reset-password/ResetPasswordForm.tsx b/src/app/auth/reset-password/ResetPasswordForm.tsx
index 44da848..9af41e1 100644
--- a/src/app/auth/reset-password/ResetPasswordForm.tsx
+++ b/src/app/auth/reset-password/ResetPasswordForm.tsx
@@ -211,7 +211,7 @@ export default function ResetPasswordForm({
                     </CardDescription>
                 </CardHeader>
                 <CardContent>
-                    <div className="space-y-8">
+                    <div className="space-y-4">
                         {state === "request" && (
                             <Form {...requestForm}>
                                 <form
diff --git a/src/app/auth/reset-password/page.tsx b/src/app/auth/reset-password/page.tsx
index c893a61..64d0c1b 100644
--- a/src/app/auth/reset-password/page.tsx
+++ b/src/app/auth/reset-password/page.tsx
@@ -2,6 +2,7 @@ import { verifySession } from "@app/lib/auth/verifySession";
 import { redirect } from "next/navigation";
 import { cache } from "react";
 import ResetPasswordForm from "./ResetPasswordForm";
+import Link from "next/link";
 
 export const dynamic = "force-dynamic";
 
@@ -27,6 +28,19 @@ export default async function Page(props: {
                 tokenParam={searchParams.token}
                 emailParam={searchParams.email}
             />
+
+            <p className="text-center text-muted-foreground mt-4">
+                <Link
+                    href={
+                        !searchParams.redirect
+                            ? `/auth/signup`
+                            : `/auth/signup?redirect=${searchParams.redirect}`
+                    }
+                    className="underline"
+                >
+                    Go to login
+                </Link>
+            </p>
         </>
     );
 }
diff --git a/src/app/auth/signup/SignupForm.tsx b/src/app/auth/signup/SignupForm.tsx
index 2fc9133..b574ba4 100644
--- a/src/app/auth/signup/SignupForm.tsx
+++ b/src/app/auth/signup/SignupForm.tsx
@@ -114,7 +114,7 @@ export default function SignupForm({ redirect }: SignupFormProps) {
                 <Form {...form}>
                     <form
                         onSubmit={form.handleSubmit(onSubmit)}
-                        className="space-y-8"
+                        className="space-y-4"
                     >
                         <FormField
                             control={form.control}
diff --git a/src/app/auth/verify-email/VerifyEmailForm.tsx b/src/app/auth/verify-email/VerifyEmailForm.tsx
index fe603a8..598a273 100644
--- a/src/app/auth/verify-email/VerifyEmailForm.tsx
+++ b/src/app/auth/verify-email/VerifyEmailForm.tsx
@@ -138,7 +138,7 @@ export default function VerifyEmailForm({
                     <Form {...form}>
                         <form
                             onSubmit={form.handleSubmit(onSubmit)}
-                            className="space-y-8"
+                            className="space-y-4"
                         >
                             <FormField
                                 control={form.control}
diff --git a/src/app/setup/page.tsx b/src/app/setup/page.tsx
index 17aad70..4f2422b 100644
--- a/src/app/setup/page.tsx
+++ b/src/app/setup/page.tsx
@@ -188,7 +188,7 @@ export default function StepperForm() {
                             <Form {...orgForm}>
                                 <form
                                     onSubmit={orgForm.handleSubmit(orgSubmit)}
-                                    className="space-y-8"
+                                    className="space-y-4"
                                 >
                                     <FormField
                                         control={orgForm.control}
diff --git a/src/components/LoginForm.tsx b/src/components/LoginForm.tsx
index 3f3b9b5..bafd8b7 100644
--- a/src/components/LoginForm.tsx
+++ b/src/components/LoginForm.tsx
@@ -134,7 +134,7 @@ export default function LoginForm({ redirect, onLogin }: LoginFormProps) {
                 <Form {...form}>
                     <form
                         onSubmit={form.handleSubmit(onSubmit)}
-                        className="space-y-8"
+                        className="space-y-4"
                     >
                         <FormField
                             control={form.control}
@@ -203,7 +203,7 @@ export default function LoginForm({ redirect, onLogin }: LoginFormProps) {
                 <Form {...mfaForm}>
                     <form
                         onSubmit={mfaForm.handleSubmit(onSubmit)}
-                        className="space-y-8"
+                        className="space-y-4"
                     >
                         <FormField
                             control={mfaForm.control}