diff --git a/lib/code_corps/github/adapters/user.ex b/lib/code_corps/github/adapters/user.ex
index 2a766907d..609bf2873 100644
--- a/lib/code_corps/github/adapters/user.ex
+++ b/lib/code_corps/github/adapters/user.ex
@@ -60,6 +60,7 @@ defmodule CodeCorps.GitHub.Adapters.User do
 
   @spec transform_type(map) :: map
   defp transform_type(%{:type => "Bot"} = map), do: Map.put(map, :type, "bot")
+  defp transform_type(%{:type => "Organization"} = map), do: Map.put(map, :type, "organization")
   defp transform_type(%{:type => "User"} = map), do: Map.put(map, :type, "user")
   defp transform_type(map), do: map
 end
diff --git a/priv/repo/migrations/20180113002017_normalize_organization_user_type.exs b/priv/repo/migrations/20180113002017_normalize_organization_user_type.exs
new file mode 100644
index 000000000..64dd44afe
--- /dev/null
+++ b/priv/repo/migrations/20180113002017_normalize_organization_user_type.exs
@@ -0,0 +1,23 @@
+defmodule CodeCorps.Repo.Migrations.NormalizeOrganizationUserType do
+  use Ecto.Migration
+
+  def up do
+    execute(
+      """
+      UPDATE github_users
+      SET type = 'organization'
+      WHERE type = 'Organization'
+      """
+    )
+  end
+
+  def down do
+    execute(
+      """
+      UPDATE github_users
+      SET type = 'Organization'
+      WHERE type = 'organization'
+      """
+    )
+  end
+end
diff --git a/priv/repo/structure.sql b/priv/repo/structure.sql
index cfe9bc6e9..71d28fe10 100644
--- a/priv/repo/structure.sql
+++ b/priv/repo/structure.sql
@@ -4159,5 +4159,5 @@ ALTER TABLE ONLY users
 -- PostgreSQL database dump complete
 --
 
-INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170131234029), (20170201014901), (20170201025454), (20170201035458), (20170201183258), (20170220032224), (20170224233516), (20170226050552), (20170228085250), (20170308214128), (20170308220713), (20170308222552), (20170313130611), (20170318032449), (20170318082740), (20170324194827), (20170424215355), (20170501225441), (20170505224222), (20170526095401), (20170602000208), (20170622205732), (20170626231059), (20170628092119), (20170628213609), (20170629183404), (20170630140136), (20170706132431), (20170707213648), (20170711122252), (20170717092127), (20170725060612), (20170727052644), (20170731130121), (20170814131722), (20170913114958), (20170921014405), (20170925214512), (20170925230419), (20170926134646), (20170927100300), (20170928234412), (20171003134956), (20171003225853), (20171006063358), (20171006161407), (20171012215106), (20171012221231), (20171016125229), (20171016125516), (20171016223356), (20171016235656), (20171017235433), (20171019191035), (20171025184225), (20171026010933), (20171027061833), (20171028011642), (20171028173508), (20171030182857), (20171031232023), (20171031234356), (20171101023309), (20171104013543), (20171106045740), (20171106050209), (20171106103153), (20171106200036), (20171109231538), (20171110001134), (20171114010851), (20171114033357), (20171114225214), (20171114225713), (20171114232534), (20171115201624), (20171115225358), (20171119004204), (20171121075226), (20171121144138), (20171123065902), (20171127215847), (20171201073818), (20171205161052), (20171213062707), (20171220154922);
+INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170131234029), (20170201014901), (20170201025454), (20170201035458), (20170201183258), (20170220032224), (20170224233516), (20170226050552), (20170228085250), (20170308214128), (20170308220713), (20170308222552), (20170313130611), (20170318032449), (20170318082740), (20170324194827), (20170424215355), (20170501225441), (20170505224222), (20170526095401), (20170602000208), (20170622205732), (20170626231059), (20170628092119), (20170628213609), (20170629183404), (20170630140136), (20170706132431), (20170707213648), (20170711122252), (20170717092127), (20170725060612), (20170727052644), (20170731130121), (20170814131722), (20170913114958), (20170921014405), (20170925214512), (20170925230419), (20170926134646), (20170927100300), (20170928234412), (20171003134956), (20171003225853), (20171006063358), (20171006161407), (20171012215106), (20171012221231), (20171016125229), (20171016125516), (20171016223356), (20171016235656), (20171017235433), (20171019191035), (20171025184225), (20171026010933), (20171027061833), (20171028011642), (20171028173508), (20171030182857), (20171031232023), (20171031234356), (20171101023309), (20171104013543), (20171106045740), (20171106050209), (20171106103153), (20171106200036), (20171109231538), (20171110001134), (20171114010851), (20171114033357), (20171114225214), (20171114225713), (20171114232534), (20171115201624), (20171115225358), (20171119004204), (20171121075226), (20171121144138), (20171123065902), (20171127215847), (20171201073818), (20171205161052), (20171213062707), (20171220154922), (20180113002017);
 
diff --git a/test/lib/code_corps/github/adapters/user_test.exs b/test/lib/code_corps/github/adapters/user_test.exs
index dafb84028..f52386aa9 100644
--- a/test/lib/code_corps/github/adapters/user_test.exs
+++ b/test/lib/code_corps/github/adapters/user_test.exs
@@ -38,8 +38,8 @@ defmodule CodeCorps.GitHub.Adapters.UserTest do
       assert User.to_user(%{"type" => "User"}) == expected_payload("user")
     end
 
-    test "does not map Organization type" do
-      assert User.to_user(%{"type" => "Organization"}) == expected_payload("Organization")
+    test "maps Organization type" do
+      assert User.to_user(%{"type" => "Organization"}) == expected_payload("organization")
     end
   end
 end