diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9cd6b64..f2c7bb01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The **patch** part changes incrementally at each release.
 * evomaintenance: tasks/variables to handle minifirewall restarts
 
 ### Changed
+* mysql-oracle: better handle packages and users
 
 ### Fixed
 
diff --git a/mysql-oracle/tasks/packages.yml b/mysql-oracle/tasks/packages.yml
index 9427c5f6..e77288c5 100644
--- a/mysql-oracle/tasks/packages.yml
+++ b/mysql-oracle/tasks/packages.yml
@@ -1,7 +1,14 @@
 ---
 
 - set_fact:
-    mysql_apt_config_package: mysql-apt-config_0.8.10-1_all.deb
+    mysql_apt_config_package: mysql-apt-config_0.8.9-1_all.deb
+
+- name: Set default MySQL version to 5.7
+  debconf:
+    name: mysql-apt-config
+    question: mysql-apt-config/enable-repo
+    value: mysql-5.7
+    vtype: select
 
 - name: MySQL APT config package is available
   copy:
@@ -26,6 +33,36 @@
 
 - meta: flush_handlers
 
+- include_role:
+    name: remount-usr
+
+- name: /usr/share/mysql exists
+  file:
+    dest: /usr/share/mysql/
+    mode: "0755"
+    owner: root
+    group: root
+    state: directory
+
+- name: mysql-systemd-start scripts is installed
+  copy:
+    src: debian/mysql-systemd-start
+    dest: /usr/share/mysql/mysql-systemd-start
+    mode: "0755"
+    owner: root
+    group: root
+    force: yes
+
+- name: systemd unit is installed
+  copy:
+    src: debian/mysql-server-5.7.mysql.service
+    dest: /etc/systemd/system/mysql.service
+    mode: "0644"
+    owner: root
+    group: root
+    force: yes
+  register: mysql_systemd_unit
+
 - name: APT cache is up-to-date
   apt:
     update_cache: yes
@@ -55,28 +92,6 @@
     - packages
   when: mysql_install_libclient
 
-- include_role:
-    name: remount-usr
-
-- name: mysql-systemd-start scripts is installed
-  copy:
-    src: debian/mysql-systemd-start
-    dest: /usr/share/mysql/mysql-systemd-start
-    mode: "0755"
-    owner: root
-    group: root
-    force: yes
-
-- name: systemd unit is installed
-  copy:
-    src: debian/mysql-server-5.7.mysql.service
-    dest: /etc/systemd/system/mysql.service
-    mode: "0755"
-    owner: root
-    group: root
-    force: yes
-  register: mysql_systemd_unit
-
 - name: MySQL is started
   systemd:
     name: mysql
diff --git a/mysql-oracle/tasks/users.yml b/mysql-oracle/tasks/users.yml
index 696743f3..7a7ee8ba 100644
--- a/mysql-oracle/tasks/users.yml
+++ b/mysql-oracle/tasks/users.yml
@@ -23,6 +23,7 @@
     update_password: on_create
     state: present
     config_file: "/etc/mysql/debian.cnf"
+    check_implicit_admin: True
   register: create_mysqladmin_user
   tags:
     - mysql