diff --git a/modules/dispatch/fd_dispatch/server/server.lua b/modules/dispatch/fd_dispatch/server/server.lua
index 1e39097..9a62eef 100644
--- a/modules/dispatch/fd_dispatch/server/server.lua
+++ b/modules/dispatch/fd_dispatch/server/server.lua
@@ -21,7 +21,7 @@ Dispatch.SendAlert = function(data)
     if type(data.job) == "string" then
         data.job = {data.job}
     end
-    local coords = data.coords or nil
+    local coords = data.coords or GetEntityCoords(GetPlayerPed(data.source))
     local alertData = {
         source = data.source,
         title = data.title or "No message provided",
@@ -31,11 +31,15 @@ Dispatch.SendAlert = function(data)
         priority = data.priority or 2,
         metadata = metadata,
         blip = {
-            radius = data.blip and data.blip.radius or 0,
+            title = data.title or "No message provided",
+            coords = coords,
+            radius = data.blip and data.blip.radius or nil,
             sprite = data.blip and data.blip.sprite or 161,
-            color = data.blip and data.blip.color or 84,
-            scale = data.blip and data.blip.scale or 1.0,
-            time  = data.time and (data.time / 1000) or nil,
+            color = data.blip and data.blip.color or 1,
+            scale = data.blip and data.blip.scale or 1.2,
+            flashes = data.blip.flash or false,
+            time = data.time or (6 * 60000),
+            category = data.category or nil,
         },
     }
     exports.fd_dispatch:addAlert(alertData)