diff --git a/aurora/aurora.py b/aurora/aurora.py
index 7bb59d5..64af9b7 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -161,7 +161,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='note', response=await interaction.original_response())
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='note', response=await interaction.original_response())
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -194,7 +194,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='warned', response=await interaction.original_response())
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='warned', response=await interaction.original_response())
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -257,7 +257,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='blacklisted', response=await interaction.original_response(), duration=matching_role['duration'])
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='blacklisted', response=await interaction.original_response(), duration=matching_role['duration'])
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -312,7 +312,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='muted', response=await interaction.original_response(), duration=parsed_time)
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='muted', response=await interaction.original_response(), duration=parsed_time)
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -355,7 +355,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='unmuted', response=await interaction.original_response())
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='unmuted', response=await interaction.original_response())
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -388,7 +388,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='kicked', response=await interaction.original_response())
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='kicked', response=await interaction.original_response())
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -446,7 +446,7 @@ class Aurora(commands.Cog):
             await interaction.response.send_message(content=f"{target.mention} has been banned for {humanize.precisedelta(parsed_time)}!\n**Reason** - `{reason}`")
 
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='tempbanned', response=await interaction.original_response(), duration=parsed_time)
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='tempbanned', response=await interaction.original_response(), duration=parsed_time)
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
@@ -466,7 +466,7 @@ class Aurora(commands.Cog):
                 silent = not await config.guild(interaction.guild).dm_users()
             if silent is False:
                 try:
-                    embed = embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='banned', response=await interaction.original_response())
+                    embed = embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='banned', response=await interaction.original_response())
                     await target.send(embed=embed)
                 except discord.errors.HTTPException:
                     pass
@@ -513,7 +513,7 @@ class Aurora(commands.Cog):
             silent = not await config.guild(interaction.guild).dm_users()
         if silent is False:
             try:
-                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, reason=reason, moderation_type='unbanned', response=await interaction.original_response())
+                embed = await embed_factory('message', await self.bot.get_embed_color(None), guild=interaction.guild, moderator=interaction.user, reason=reason, moderation_type='unbanned', response=await interaction.original_response())
                 await target.send(embed=embed)
             except discord.errors.HTTPException:
                 pass
diff --git a/aurora/utilities/embed_factory.py b/aurora/utilities/embed_factory.py
index a80ff3f..726d1ee 100644
--- a/aurora/utilities/embed_factory.py
+++ b/aurora/utilities/embed_factory.py
@@ -1,15 +1,16 @@
 # pylint: disable=cyclic-import
 
+from typing import Union
 from datetime import datetime, timedelta
 
 import humanize
-from discord import Color, Embed, Guild, Interaction, InteractionMessage
+from discord import Color, Embed, Guild, Interaction, InteractionMessage, User, Member
 
 from .config import config
 from .utils import fetch_channel_dict, fetch_user_dict, get_next_case_number
 
 
-async def embed_factory(embed_type: str, color: Color, /,  interaction: Interaction = None, case_dict: dict = None, guild: Guild = None, reason: str = None, moderation_type: str = None, response: InteractionMessage = None, duration: timedelta = None, resolved: bool = False):
+async def embed_factory(embed_type: str, color: Color, /,  interaction: Interaction = None, case_dict: dict = None, guild: Guild = None, reason: str = None, moderator: Union[Member, User] = None, moderation_type: str = None, response: InteractionMessage = None, duration: timedelta = None, resolved: bool = False):
     """This method creates an embed from set parameters, meant for either moderation logging or contacting the moderated user.
 
     Valid arguments for 'embed_type':
@@ -23,6 +24,7 @@ async def embed_factory(embed_type: str, color: Color, /,  interaction: Interact
     - reason
     - moderation_type
     - response
+    - moderator (optional)
     - duration (optional)
 
     Required arguments for 'log':
@@ -53,8 +55,8 @@ async def embed_factory(embed_type: str, color: Color, /,  interaction: Interact
 
         embed = Embed(title=str.title(moderation_type), description=f"You have {embed_desc} {moderation_type}{embed_duration} in {guild_name}.", color=color, timestamp=datetime.now())
 
-        if await config.guild(guild).show_moderator():
-            embed.add_field(name='Moderator', value=f"`{interaction.user.name} ({interaction.user.id})`", inline=False)
+        if await config.guild(guild).show_moderator() and moderator is not None:
+            embed.add_field(name='Moderator', value=f"`{moderator.name} ({moderator.id})`", inline=False)
 
         embed.add_field(name='Reason', value=f"`{reason}`", inline=False)