diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6242b1f..f1274e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Removed
 
 - remove support for debian 9
+- the influxdb_api_password variable isn't set by default
 
 ## [1.0.0] 2019-04-12
 
diff --git a/README.md b/README.md
index 7d8b95b..792fc3b 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Install and configure InfluxDB
   state: present
 ```
 
-* `influxdb_api_user` -  set the api user if you have enabled http authentification
+* `influxdb_api_user` -  set the api user if you have enabled http authentification (default: `admin`)
 * `influxdb_api_password` - set the api password if you have enabled http authentification
 * `influxdb_api_port` - set the api port (default: `8086`)
 * `influxdb_config` - hash with the influxdb configuration (see [influxdb documentation](https://docs.influxdata.com/influxdb/v1.7/administration/config/))
diff --git a/defaults/main.yml b/defaults/main.yml
index 022c1c6..a875da3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,8 +1,7 @@
 ---
 influxdb_databases: []
 influxdb_users: []
-influxdb_api_user: user
-influxdb_api_password: password
+influxdb_api_user: admin
 influxdb_api_port: 8086
 influxdb_default_config:
   meta:
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 2c3dd75..d428b13 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -4,9 +4,10 @@
   roles:
     - ansible-role-influxdb
   vars:
+    influxdb_api_password: password
     influxdb_users:
-      - name: admin
-        password: test
+      - name: '{{ influxdb_api_user }}'
+        password: '{{ influxdb_api_password }}'
         admin: yes
       - name: test
         password: test2