diff --git a/CODEOWNERS b/CODEOWNERS
index fb6b204253b8..d8b6cc62b8a9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -115,6 +115,7 @@ homeassistant/components/homeassistant/* @home-assistant/core
 homeassistant/components/homekit/* @cdce8p
 homeassistant/components/homekit_controller/* @Jc2k
 homeassistant/components/homematic/* @pvizeli @danielperna84
+homeassistant/components/honeywell/* @zxdavb
 homeassistant/components/html5/* @robbiet480
 homeassistant/components/http/* @home-assistant/core
 homeassistant/components/huawei_lte/* @scop
diff --git a/homeassistant/components/honeywell/__init__.py b/homeassistant/components/honeywell/__init__.py
index 59a90711e575..53259dcf275c 100644
--- a/homeassistant/components/honeywell/__init__.py
+++ b/homeassistant/components/honeywell/__init__.py
@@ -1 +1 @@
-"""Support for Honeywell Round Connected and Honeywell Evohome thermostats."""
+"""Support for Honeywell Total Connect Comfort climate systems."""
diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index 75bbb2ca5d81..3ebb2a9bb85b 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -1,4 +1,4 @@
-"""Support for Honeywell Round Connected and Honeywell Evohome thermostats."""
+"""Support for Honeywell Total Connect Comfort climate systems."""
 import logging
 import datetime
 
@@ -25,9 +25,9 @@ CONF_AWAY_TEMPERATURE = 'away_temperature'
 CONF_COOL_AWAY_TEMPERATURE = 'away_cool_temperature'
 CONF_HEAT_AWAY_TEMPERATURE = 'away_heat_temperature'
 
-DEFAULT_AWAY_TEMPERATURE = 16
-DEFAULT_COOL_AWAY_TEMPERATURE = 30
-DEFAULT_HEAT_AWAY_TEMPERATURE = 16
+DEFAULT_AWAY_TEMPERATURE = 16  # in C, for eu regions, the others are F/us
+DEFAULT_COOL_AWAY_TEMPERATURE = 88
+DEFAULT_HEAT_AWAY_TEMPERATURE = 61
 DEFAULT_REGION = 'eu'
 REGIONS = ['eu', 'us']
 
@@ -37,9 +37,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_AWAY_TEMPERATURE,
                  default=DEFAULT_AWAY_TEMPERATURE): vol.Coerce(float),
     vol.Optional(CONF_COOL_AWAY_TEMPERATURE,
-                 default=DEFAULT_COOL_AWAY_TEMPERATURE): vol.Coerce(float),
+                 default=DEFAULT_COOL_AWAY_TEMPERATURE): vol.Coerce(int),
     vol.Optional(CONF_HEAT_AWAY_TEMPERATURE,
-                 default=DEFAULT_HEAT_AWAY_TEMPERATURE): vol.Coerce(float),
+                 default=DEFAULT_HEAT_AWAY_TEMPERATURE): vol.Coerce(int),
     vol.Optional(CONF_REGION, default=DEFAULT_REGION): vol.In(REGIONS),
 })
 
diff --git a/homeassistant/components/honeywell/manifest.json b/homeassistant/components/honeywell/manifest.json
index c3d76703e91d..ba7595045290 100644
--- a/homeassistant/components/honeywell/manifest.json
+++ b/homeassistant/components/honeywell/manifest.json
@@ -7,5 +7,5 @@
     "somecomfort==0.5.2"
   ],
   "dependencies": [],
-  "codeowners": []
+  "codeowners": ["@zxdavb"]
 }