diff --git a/apps/next/package.json b/apps/next/package.json
index ae98f1a..ac07db8 100644
--- a/apps/next/package.json
+++ b/apps/next/package.json
@@ -39,7 +39,7 @@
     "radix-ui": "^1.4.3",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
-    "react-hook-form": "^7.62.0",
+    "react-hook-form": "^7.63.0",
     "react-image-crop": "^11.0.10",
     "require-in-the-middle": "^7.5.2",
     "sonner": "^2.0.7",
diff --git a/apps/next/src/app/(auth)/profile/page.tsx b/apps/next/src/app/(auth)/profile/page.tsx
index 28655a7..59e10e2 100644
--- a/apps/next/src/app/(auth)/profile/page.tsx
+++ b/apps/next/src/app/(auth)/profile/page.tsx
@@ -18,8 +18,7 @@ const Profile = async () => {
       <AvatarUpload preloadedUser={preloadedUser} />
       <Separator />
       <UserInfoForm preloadedUser={preloadedUser} />
-      <Separator />
-      <ResetPasswordForm />
+      <ResetPasswordForm preloadedUser={preloadedUser} />
       <Separator />
       <SignOutForm />
     </Card>
diff --git a/apps/next/src/app/(auth)/signin/page.tsx b/apps/next/src/app/(auth)/signin/page.tsx
index b1e2bcf..1a35512 100644
--- a/apps/next/src/app/(auth)/signin/page.tsx
+++ b/apps/next/src/app/(auth)/signin/page.tsx
@@ -222,16 +222,22 @@ const SignIn = () => {
                     </SubmitButton>
                   </form>
                 </Form>
-                <div className='flex my-auto justify-center w-2/3'>
-                  <div className='flex flex-row w-1/3 items-center my-2.5'>
+                <div className='flex justify-center'>
+                  <div
+                    className='flex flex-row items-center
+                    my-2.5 mx-auto justify-center w-1/4'
+                  >
                     <Separator className='py-0.5 mr-3' />
                     <span className='font-semibold text-lg'>or</span>
                     <Separator className='py-0.5 ml-3' />
                   </div>
                 </div>
-                <div className='flex my-auto justify-center'>
+                <div className='flex justify-center mb-3'>
                   <MicrosoftSignInButton />
                 </div>
+                <div className='flex justify-center mt-3'>
+                  <GibsAuthSignInButton />
+                </div>
               </CardContent>
             </Card>
           </TabsContent>
@@ -337,9 +343,12 @@ const SignIn = () => {
                     <Separator className='py-0.5 ml-3' />
                   </div>
                 </div>
-                <div className='flex my-auto justify-center'>
+                <div className='flex justify-center mb-3'>
                   <MicrosoftSignInButton type='signUp' />
                 </div>
+                <div className='flex justify-center mt-3'>
+                  <GibsAuthSignInButton type='signUp' />
+                </div>
               </CardContent>
             </Card>
           </TabsContent>
diff --git a/apps/next/src/components/layout/auth/buttons/microsoft.tsx b/apps/next/src/components/layout/auth/buttons/microsoft.tsx
index d72283d..99f0db0 100644
--- a/apps/next/src/components/layout/auth/buttons/microsoft.tsx
+++ b/apps/next/src/components/layout/auth/buttons/microsoft.tsx
@@ -20,7 +20,7 @@ export const MicrosoftSignInButton = ({
     <Button
       size='lg'
       onClick={() => signIn('microsoft-entra-id')}
-      className='text-lg font-semibold mx-auto'
+      className='text-lg font-semibold'
       {...buttonProps}
     >
       <div className='flex flex-row my-auto space-x-2'>
diff --git a/apps/next/src/components/layout/profile/reset-password.tsx b/apps/next/src/components/layout/profile/reset-password.tsx
index cd40c2c..79f94e5 100644
--- a/apps/next/src/components/layout/profile/reset-password.tsx
+++ b/apps/next/src/components/layout/profile/reset-password.tsx
@@ -3,6 +3,7 @@ import { useState } from 'react';
 import { useAction } from 'convex/react';
 import { api } from '~/convex/_generated/api';
 import { z } from 'zod';
+import { type Preloaded, usePreloadedQuery } from 'convex/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import {
@@ -18,6 +19,7 @@ import {
   FormLabel,
   FormMessage,
   Input,
+  Separator,
   SubmitButton,
 } from '@/components/ui';
 import { toast } from 'sonner';
@@ -62,7 +64,12 @@ const formSchema = z
     path: ['confirmPassword'],
   });
 
-export const ResetPasswordForm = () => {
+type ResetFormProps = {
+  preloadedUser: Preloaded<typeof api.auth.getUser>;
+};
+
+export const ResetPasswordForm = ({ preloadedUser }: ResetFormProps) => {
+  const user = usePreloadedQuery(preloadedUser);
   const [loading, setLoading] = useState(false);
 
   const changePassword = useAction(api.auth.updateUserPassword);
@@ -94,9 +101,11 @@ export const ResetPasswordForm = () => {
       setLoading(false);
     }
   };
-
-  return (
+  return user?.provider !== 'password' ? (
+    <div />
+  ) : (
     <>
+      <Separator />
       <CardHeader>
         <CardTitle className='text-2xl'>Change Password</CardTitle>
         <CardDescription>
diff --git a/apps/next/src/components/layout/profile/user-info.tsx b/apps/next/src/components/layout/profile/user-info.tsx
index 52ac7e1..c89e0c6 100644
--- a/apps/next/src/components/layout/profile/user-info.tsx
+++ b/apps/next/src/components/layout/profile/user-info.tsx
@@ -133,7 +133,10 @@ export const UserInfoForm = ({ preloadedUser }: UserInfoFormProps) => {
                 <FormItem>
                   <FormLabel>Email</FormLabel>
                   <FormControl>
-                    <Input {...field} />
+                    <Input
+                      {...field}
+                      disabled={user?.provider !== 'password'}
+                    />
                   </FormControl>
                   <FormDescription>
                     Your email address associated with your account.
diff --git a/bun.lock b/bun.lock
index faee0d0..2de532b 100644
--- a/bun.lock
+++ b/bun.lock
@@ -5,7 +5,7 @@
       "name": "techtracker",
       "devDependencies": {
         "@types/node": "^20.19.17",
-        "eslint": "^9.35.0",
+        "eslint": "^9.36.0",
         "prettier": "^3.6.2",
         "turbo": "^2.5.6",
         "typescript": "^5.9.2",
@@ -80,7 +80,7 @@
         "radix-ui": "^1.4.3",
         "react": "^19.1.1",
         "react-dom": "^19.1.1",
-        "react-hook-form": "^7.62.0",
+        "react-hook-form": "^7.63.0",
         "react-image-crop": "^11.0.10",
         "require-in-the-middle": "^7.5.2",
         "sonner": "^2.0.7",
@@ -106,7 +106,9 @@
       "name": "@techtracker/convex",
       "version": "1.0.0",
       "dependencies": {
+        "@oslojs/crypto": "^1.0.1",
         "convex": "^1.27.0",
+        "resend": "^6.1.0",
       },
       "devDependencies": {
         "typescript": "5.9.2",
@@ -2347,7 +2349,7 @@
 
     "react-freeze": ["react-freeze@1.0.4", "", { "peerDependencies": { "react": ">=17.0.0" } }, "sha512-r4F0Sec0BLxWicc7HEyo2x3/2icUTrRmDjaaRyzzn+7aDyFZliszMDOgLVwSnQnYENOlL1o569Ze2HZefk8clA=="],
 
-    "react-hook-form": ["react-hook-form@7.62.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA=="],
+    "react-hook-form": ["react-hook-form@7.63.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-ZwueDMvUeucovM2VjkCf7zIHcs1aAlDimZu2Hvel5C5907gUzMpm4xCrQXtRzCvsBqFjonB4m3x4LzCFI1ZKWA=="],
 
     "react-image-crop": ["react-image-crop@11.0.10", "", { "peerDependencies": { "react": ">=16.13.1" } }, "sha512-+5FfDXUgYLLqBh1Y/uQhIycpHCbXkI50a+nbfkB1C0xXXUTwkisHDo2QCB1SQJyHCqIuia4FeyReqXuMDKWQTQ=="],
 
@@ -2407,6 +2409,8 @@
 
     "requireg": ["requireg@0.2.2", "", { "dependencies": { "nested-error-stacks": "~2.0.1", "rc": "~1.2.7", "resolve": "~1.7.1" } }, "sha512-nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="],
 
+    "resend": ["resend@6.1.0", "", { "peerDependencies": { "@react-email/render": "^1.1.0" }, "optionalPeers": ["@react-email/render"] }, "sha512-H0cJI2pcLk5/dGwyvZUHu+O7X/q6arvc40EWm+pRPuy+PSWojH5utZtmDBUZ2L0+gVwYZiWs6y2lw6GQA1z1rg=="],
+
     "resolve": ["resolve@1.22.8", "", { "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="],
 
     "resolve-from": ["resolve-from@5.0.0", "", {}, "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="],
diff --git a/packages/backend/convex/auth.ts b/packages/backend/convex/auth.ts
index 147a389..729c4d9 100644
--- a/packages/backend/convex/auth.ts
+++ b/packages/backend/convex/auth.ts
@@ -10,9 +10,12 @@ import { type Id } from './_generated/dataModel';
 import { action, mutation, query } from './_generated/server';
 import Authentik from '@auth/core/providers/authentik';
 import { Entra, Password, validatePassword } from './custom/auth';
+import Resend from '@auth/core/providers/resend';
+import { Resend as ResendAPI } from 'resend';
+import { generateRandomString, RandomReader } from '@oslojs/crypto/random';
 
 export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
-  providers: [Password, Authentik, Entra],
+  providers: [Authentik, Entra, Password],
 });
 
 export const PASSWORD_MIN = 8;
@@ -172,3 +175,32 @@ export const updateUserPassword = action({
     return { success: true };
   },
 });
+
+//export const ResendOTPPasswordReset = Resend({
+//id: "resend-otp",
+//apiKey: process.env.AUTH_RESEND_KEY,
+//async generateVerificationToken() {
+//const random: RandomReader = {
+//read(bytes) {
+//crypto.getRandomValues(bytes);
+//},
+//};
+
+//const alphabet = "0123456789";
+//const length = 8;
+//return generateRandomString(random, alphabet, length);
+//},
+//async sendVerificationRequest({ identifier: email, provider, token }) {
+//const resend = new ResendAPI(provider.apiKey);
+//const { error } = await resend.emails.send({
+//from: "My App <onboarding@resend.dev>",
+//to: [email],
+//subject: `Reset your password in My App`,
+//text: "Your password reset code is " + token,
+//});
+
+//if (error) {
+//throw new Error("Could not send");
+//}
+//},
+//});
diff --git a/packages/backend/convex/statuses.ts b/packages/backend/convex/statuses.ts
index 6aec71b..47232f4 100644
--- a/packages/backend/convex/statuses.ts
+++ b/packages/backend/convex/statuses.ts
@@ -58,29 +58,33 @@ export const create = mutation({
     updatedBy: v.optional(v.id('users')),
   },
   handler: async (ctx, args) => {
-    const authUserId = await getAuthUserId(ctx);
+    const authUserId: Id<'users'> | null = await getAuthUserId(ctx);
     if (!args.userId && !authUserId) {
       throw new ConvexError('Not authenticated.');
     }
-
-    const userId = args.userId ?? authUserId!;
-    const updatedBy = args.updatedBy ?? authUserId!;
-
-    await ensureUser(ctx, userId);
-    await ensureUser(ctx, updatedBy);
-
     const message = args.message.trim();
     if (message.length === 0) {
       throw new ConvexError('Message cannot be empty.');
     }
-
-    const statusId = await ctx.db.insert('statuses', {
-      message,
-      userId,
-      updatedBy,
-      updatedAt: Date.now(),
-    });
-
+    const userId = args.userId ?? authUserId!;
+    const updatedBy = args.updatedBy ?? authUserId;
+    await ensureUser(ctx, userId);
+    let statusId: Id<'statuses'>;
+    if (updatedBy) {
+      ensureUser(ctx, updatedBy);
+      statusId = await ctx.db.insert('statuses', {
+        message,
+        userId,
+        updatedBy,
+        updatedAt: Date.now(),
+      });
+    } else {
+      statusId = await ctx.db.insert('statuses', {
+        message,
+        userId,
+        updatedAt: Date.now(),
+      });
+    }
     await ctx.db.patch(userId, { currentStatusId: statusId });
     return { statusId };
   },
@@ -125,7 +129,6 @@ export const bulkCreate = mutation({
   },
 });
 
-// Update all users - simplified
 export const updateAllStatuses = mutation({
   args: { message: v.string() },
   handler: async (ctx, args) => {
@@ -152,22 +155,19 @@ export const updateAllStatuses = mutation({
   },
 });
 
-// Lunch status with automatic return - this should be an action
 export const createLunchStatus = mutation({
   args: {},
   handler: async (ctx) => {
     const authUserId = await getAuthUserId(ctx);
     if (!authUserId) throw new ConvexError('Not authenticated.');
-    // Create lunch status
     await ctx.runMutation(api.statuses.create, {
       message: 'At lunch',
-      userId: authUserId
+      userId: authUserId,
     });
     const oneHour = 60 * 60 * 1000;
-    console.log('Scheduling return to desk after 1 hour');
     await ctx.scheduler.runAfter(oneHour, api.statuses.create, {
       message: 'At desk',
-      userId: authUserId
+      userId: authUserId,
     });
     return { success: true };
   },
@@ -257,7 +257,10 @@ export const listHistory = query({
     userId: v.optional(v.id('users')),
     paginationOpts: paginationOptsValidator,
   },
-  handler: async (ctx, { userId, paginationOpts }): Promise<Paginated<StatusRow>> => {
+  handler: async (
+    ctx,
+    { userId, paginationOpts },
+  ): Promise<Paginated<StatusRow>> => {
     const result = userId
       ? await ctx.db
           .query('statuses')
diff --git a/packages/backend/package.json b/packages/backend/package.json
index aceb00d..064e04b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -11,7 +11,9 @@
   "author": "Gib",
   "license": "ISC",
   "dependencies": {
-    "convex": "^1.27.0"
+    "@oslojs/crypto": "^1.0.1",
+    "convex": "^1.27.0",
+    "resend": "^6.1.0"
   },
   "devDependencies": {
     "typescript": "5.9.2"