diff --git a/components/Modals/NewEvent.tsx b/components/Modals/NewEvent.tsx
index 1a268b3..ebd4726 100644
--- a/components/Modals/NewEvent.tsx
+++ b/components/Modals/NewEvent.tsx
@@ -12,7 +12,7 @@ import {
   HiChatBubbleLeftEllipsis,
   HiBookmarkSquare,
   HiNewspaper,
-  HiUserGroup,
+  HiCalendarDays,
 } from "react-icons/hi2";
 import { RiSubtractFill, RiAddFill } from "react-icons/ri";
 import { formatCount } from "@/lib/utils";
@@ -41,7 +41,7 @@ export default function NewEventModal() {
           className="w-full gap-x-1"
         >
           <span>Calendar Event</span>
-          <HiChatBubbleLeftEllipsis className="h-4 w-4" />
+          <HiCalendarDays className="h-4 w-4" />
         </Button>
         <Link href={`/article/new`}>
           <Button onClick={() => modal?.hide()} className="w-full gap-x-1">
diff --git a/lib/actions/create.ts b/lib/actions/create.ts
index 215c921..4300ca8 100644
--- a/lib/actions/create.ts
+++ b/lib/actions/create.ts
@@ -27,8 +27,8 @@ export async function createEvent(
 ) {
   log("func", "createEvent");
   try {
-    const pubkey = await window.nostr?.getPublicKey();
-    if (!pubkey || !window.nostr) {
+    const pubkey = ndk.activeUser?.pubkey;
+    if (!pubkey) {
       throw new Error("No public key provided!");
     }
     const eventToPublish = new NDKEvent(ndk, {
@@ -57,8 +57,8 @@ export async function createEventHandler(
   delegateSigner?: NDKPrivateKeySigner,
 ) {
   log("func", "createEventHandler");
-  const pubkey = await window.nostr?.getPublicKey();
-  if (!pubkey || !window.nostr) {
+  const pubkey = ndk.activeUser?.pubkey;
+  if (!pubkey) {
     throw new Error("No public key provided!");
   }
   const eventToPublish = new NDKEvent(ndk, {
@@ -333,7 +333,6 @@ export async function createCalendarEvent(
   } as NostrEvent);
 
   await eventToPublish.sign();
-
   let publishedEvent: NDKEvent | null = null;
   // Check if is private event
   if (isPrivate) {