diff --git a/ChaosBot/WebServer/App/CustomCommandApi.cs b/ChaosBot/WebServer/App/CustomCommandApi.cs
index cec548e..86d5e7d 100644
--- a/ChaosBot/WebServer/App/CustomCommandApi.cs
+++ b/ChaosBot/WebServer/App/CustomCommandApi.cs
@@ -30,7 +30,9 @@ namespace ChaosBot.WebServer.App
                 .Where(cc => cc.DiscordGuildId == guildId)
                 .ToList();
 
-            return Json(customCommands);
+            List<CustomCommandResponse> response = customCommands.Select(e => new CustomCommandResponse(e)).ToList();
+
+            return Json(response);
         }
         
         [HttpPost]
@@ -79,4 +81,4 @@ namespace ChaosBot.WebServer.App
             return NoContent();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ChaosBot/WebServer/App/DiscordController.cs b/ChaosBot/WebServer/App/DiscordController.cs
index 6a2b8a5..0e298e0 100644
--- a/ChaosBot/WebServer/App/DiscordController.cs
+++ b/ChaosBot/WebServer/App/DiscordController.cs
@@ -103,7 +103,7 @@ namespace ChaosBot.WebServer.App
             List<ulong> presentGuilds = DiscordConnect._client.Guilds.Select(g => g.Id).ToList();
             List<DiscordGuildResponseWithPresence> userResponseWithPresence =
                 userResponse
-                    .Select(guild => guild.AddPresence(presentGuilds.Contains(guild.id)))
+                    .Select(guild => guild.AddPresence(presentGuilds.Contains(Convert.ToUInt64(guild.id))))
                     .ToList();
 
             return Json(userResponseWithPresence);
@@ -156,7 +156,7 @@ namespace ChaosBot.WebServer.App
 
     public class DiscordGuildResponse
     {
-        public ulong id { get; set; }
+        public string id { get; set; }
         public string name { get; set; }
         public string icon { get; set; }
         public bool owner { get; set; }
diff --git a/ChaosBot/WebServer/Models/CustomCommandResponse.cs b/ChaosBot/WebServer/Models/CustomCommandResponse.cs
new file mode 100644
index 0000000..524b13b
--- /dev/null
+++ b/ChaosBot/WebServer/Models/CustomCommandResponse.cs
@@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+using ChaosBot.Models;
+
+namespace ChaosBot.WebServer.Models
+{
+    class CustomCommandResponse
+    {
+        [Required]
+        public string DiscordGuildId { get; }
+        [Required]
+        [MaxLength(128)]
+        public string Command { get; }
+        [Required]
+        public CustomCommandType Type { get; }
+        [Required]
+        public string Content { get; }
+        
+        public CustomCommandResponse(CustomCommand command)
+        {
+            DiscordGuildId = command.DiscordGuildId.ToString();
+            Command = command.Command;
+            Type = command.Type;
+            Content = command.Content;
+        }
+    }
+}
diff --git a/ChaosBot/wwwroot b/ChaosBot/wwwroot
index d4c2459..731a916 160000
--- a/ChaosBot/wwwroot
+++ b/ChaosBot/wwwroot
@@ -1 +1 @@
-Subproject commit d4c245976b38189d588304bfc26b644727846c0e
+Subproject commit 731a91679f5786e136f06a52b7a62ad45b9a4cd7