diff --git a/lib/ansible/modules/extras/monitoring/zabbix_host.py b/lib/ansible/modules/extras/monitoring/zabbix_host.py
index e69d301917..d3b543f664 100644
--- a/lib/ansible/modules/extras/monitoring/zabbix_host.py
+++ b/lib/ansible/modules/extras/monitoring/zabbix_host.py
@@ -335,13 +335,13 @@ def main():
         argument_spec=dict(
             server_url=dict(required=True, default=None, aliases=['url']),
             login_user=dict(required=True),
-            login_password=dict(required=True),
+            login_password=dict(required=True, no_log=True),
             host_name=dict(required=True),
             host_groups=dict(required=False),
             link_templates=dict(required=False),
-            status=dict(default="enabled"),
-            state=dict(default="present"),
-            timeout=dict(default=10),
+            status=dict(default="enabled", choices=['enabled', 'disabled']),
+            state=dict(default="present", choices=['present', 'absent']),
+            timeout=dict(type='int', default=10),
             interfaces=dict(required=False)
         ),
         supports_check_mode=True
diff --git a/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py b/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py
index c0661424dc..fa673d879f 100644
--- a/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py
+++ b/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py
@@ -168,12 +168,12 @@ def main():
         argument_spec=dict(
             server_url=dict(required=True, default=None, aliases=['url']),
             login_user=dict(required=True),
-            login_password=dict(required=True),
+            login_password=dict(required=True, no_log=True),
             host_name=dict(required=True),
             macro_name=dict(required=True),
             macro_value=dict(required=True),
-            state=dict(default="present"),
-            timeout=dict(default=10)
+            state=dict(default="present", choices=['present', 'absent']),
+            timeout=dict(type='int', default=10)
         ),
         supports_check_mode=True
     )
diff --git a/lib/ansible/modules/extras/monitoring/zabbix_screen.py b/lib/ansible/modules/extras/monitoring/zabbix_screen.py
index 9a01eeaf34..64f53afa8f 100644
--- a/lib/ansible/modules/extras/monitoring/zabbix_screen.py
+++ b/lib/ansible/modules/extras/monitoring/zabbix_screen.py
@@ -314,9 +314,9 @@ def main():
         argument_spec=dict(
             server_url=dict(required=True, default=None, aliases=['url']),
             login_user=dict(required=True),
-            login_password=dict(required=True),
-            timeout=dict(default=10),
-            screens=dict(required=True)
+            login_password=dict(required=True, no_log=True),
+            timeout=dict(type='int', default=10),
+            screens=dict(type='dict', required=True)
         ),
         supports_check_mode=True
     )