diff --git a/CODEOWNERS b/CODEOWNERS
index c45293d03c8..c282e00049f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -346,7 +346,7 @@ build.json @home-assistant/supervisor
 /tests/components/energy/ @home-assistant/core
 /homeassistant/components/energyzero/ @klaasnicolaas
 /tests/components/energyzero/ @klaasnicolaas
-/homeassistant/components/enigma2/ @fbradyirl
+/homeassistant/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
diff --git a/homeassistant/components/enigma2/manifest.json b/homeassistant/components/enigma2/manifest.json
index 932cbda66ec..a70d5a05eeb 100644
--- a/homeassistant/components/enigma2/manifest.json
+++ b/homeassistant/components/enigma2/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "enigma2",
   "name": "Enigma2 (OpenWebif)",
-  "codeowners": ["@fbradyirl"],
+  "codeowners": ["@autinerd"],
   "documentation": "https://www.home-assistant.io/integrations/enigma2",
   "iot_class": "local_polling",
   "loggers": ["openwebif"],