diff --git a/vsftpd.changes b/vsftpd.changes
index 1755e51..8142a20 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 14:27:27 UTC 2016 - tchvatal@suse.com
+
+- Fix user creation to not report error when user alredy exist
+  Spotted during testing of bnc#971784
+
 -------------------------------------------------------------------
 Mon Mar 21 12:53:59 UTC 2016 - tchvatal@suse.com
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 1e4c1b2..68e5dae 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -151,7 +151,7 @@ install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 %pre
-%{_sbindir}/useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure 2> /dev/null || :
+getent passwd ftpsecure >/dev/null || useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure 2> /dev/null
 %if %{with_systemd}
 %service_add_pre %{name}.service %{name}@.service %{name}.socket
 %endif