diff --git a/config/config.exs b/config/config.exs
index 54e532f4..6a1f75c2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -18,4 +18,6 @@ config :logger, :console,
 
 config :phoenix, :json_library, Jason
 
+config :gettext, :default_locale, "en"
+
 import_config "#{Mix.env()}.exs"
diff --git a/config/releases.exs b/config/releases.exs
index 5722a062..9915ca7c 100644
--- a/config/releases.exs
+++ b/config/releases.exs
@@ -4,9 +4,15 @@ defmodule Util do
   def random_encoded_bytes do
     :crypto.strong_rand_bytes(64) |> Base.encode64()
   end
+
+  def validate_locale!("en"), do: "en"
+  def validate_locale!("de"), do: "de"
+  def validate_locale!(lang), do: raise("Unsopported locale #{inspect(lang)}")
 end
 
-config :gettext, :default_locale, System.get_env("LOCALE")
+config :gettext,
+       :default_locale,
+       System.get_env("LOCALE", "en") |> Util.validate_locale!()
 
 config :teslamate, TeslaMate.Repo,
   username: System.fetch_env!("DATABASE_USER"),
diff --git a/lib/teslamate/locations/geocoder.ex b/lib/teslamate/locations/geocoder.ex
index 36bfe32e..c3b1087d 100644
--- a/lib/teslamate/locations/geocoder.ex
+++ b/lib/teslamate/locations/geocoder.ex
@@ -43,7 +43,7 @@ defmodule TeslaMate.Locations.Geocoder do
   end
 
   defp lang do
-    Application.get_env(:gettext, :default_locale, "en")
+    Application.fetch_env!(:gettext, :default_locale)
   end
 
   # Address Formatting
diff --git a/mix.exs b/mix.exs
index cec28ce0..0986a505 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule TeslaMate.MixProject do
   def project do
     [
       app: :teslamate,
-      version: "1.7.0",
+      version: "1.8.0-beta",
       elixir: "~> 1.9",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),