diff --git a/CODEOWNERS b/CODEOWNERS
index 0aca3b9d6fb..3bf34fc2613 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -303,6 +303,7 @@ homeassistant/components/switchmate/* @danielhiversen
 homeassistant/components/syncthru/* @nielstron
 homeassistant/components/synology_srm/* @aerialls
 homeassistant/components/syslog/* @fabaff
+homeassistant/components/tado/* @michaelarnauts
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tautulli/* @ludeeus
 homeassistant/components/tellduslive/* @fredrike
diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py
index b13ef6856ab..1739cbb9254 100644
--- a/homeassistant/components/tado/__init__.py
+++ b/homeassistant/components/tado/__init__.py
@@ -116,7 +116,7 @@ class TadoDataStore:
         return self.tado.getCapabilities(tado_id)
 
     def get_me(self):
-        """Wrap for getMet()."""
+        """Wrap for getMe()."""
         return self.tado.getMe()
 
     def reset_zone_overlay(self, zone_id):
diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py
index da19080e8f7..b6a7f3d8bdb 100644
--- a/homeassistant/components/tado/climate.py
+++ b/homeassistant/components/tado/climate.py
@@ -48,22 +48,22 @@ FAN_MAP_TADO = {"HIGH": FAN_HIGH, "MIDDLE": FAN_MIDDLE, "LOW": FAN_LOW}
 
 HVAC_MAP_TADO_HEAT = {
     "MANUAL": HVAC_MODE_HEAT,
-    "TIMER": HVAC_MODE_AUTO,
-    "TADO_MODE": HVAC_MODE_AUTO,
+    "TIMER": HVAC_MODE_HEAT,
+    "TADO_MODE": HVAC_MODE_HEAT,
     "SMART_SCHEDULE": HVAC_MODE_AUTO,
     "OFF": HVAC_MODE_OFF,
 }
 HVAC_MAP_TADO_COOL = {
     "MANUAL": HVAC_MODE_COOL,
-    "TIMER": HVAC_MODE_AUTO,
-    "TADO_MODE": HVAC_MODE_AUTO,
+    "TIMER": HVAC_MODE_COOL,
+    "TADO_MODE": HVAC_MODE_COOL,
     "SMART_SCHEDULE": HVAC_MODE_AUTO,
     "OFF": HVAC_MODE_OFF,
 }
 HVAC_MAP_TADO_HEAT_COOL = {
     "MANUAL": HVAC_MODE_HEAT_COOL,
-    "TIMER": HVAC_MODE_AUTO,
-    "TADO_MODE": HVAC_MODE_AUTO,
+    "TIMER": HVAC_MODE_HEAT_COOL,
+    "TADO_MODE": HVAC_MODE_HEAT_COOL,
     "SMART_SCHEDULE": HVAC_MODE_AUTO,
     "OFF": HVAC_MODE_OFF,
 }
@@ -325,7 +325,7 @@ class TadoClimate(ClimateDevice):
         if temperature is None:
             return
 
-        self._current_operation = CONST_OVERLAY_MANUAL
+        self._current_operation = CONST_OVERLAY_TADO_MODE
         self._overlay_mode = None
         self._target_temp = temperature
         self._control_heating()
@@ -339,11 +339,11 @@ class TadoClimate(ClimateDevice):
         elif hvac_mode == HVAC_MODE_AUTO:
             mode = CONST_MODE_SMART_SCHEDULE
         elif hvac_mode == HVAC_MODE_HEAT:
-            mode = CONST_OVERLAY_MANUAL
+            mode = CONST_OVERLAY_TADO_MODE
         elif hvac_mode == HVAC_MODE_COOL:
-            mode = CONST_OVERLAY_MANUAL
+            mode = CONST_OVERLAY_TADO_MODE
         elif hvac_mode == HVAC_MODE_HEAT_COOL:
-            mode = CONST_OVERLAY_MANUAL
+            mode = CONST_OVERLAY_TADO_MODE
 
         self._current_operation = mode
         self._overlay_mode = None
diff --git a/homeassistant/components/tado/manifest.json b/homeassistant/components/tado/manifest.json
index 9a884fa010c..4728f1622ed 100644
--- a/homeassistant/components/tado/manifest.json
+++ b/homeassistant/components/tado/manifest.json
@@ -6,5 +6,7 @@
     "python-tado==0.2.9"
   ],
   "dependencies": [],
-  "codeowners": []
+  "codeowners": [
+    "@michaelarnauts"
+  ]
 }