diff --git a/ckanext/datastore/commands.py b/ckanext/datastore/commands.py
index 179ec79647c..1a8bcdd06d6 100644
--- a/ckanext/datastore/commands.py
+++ b/ckanext/datastore/commands.py
@@ -100,7 +100,8 @@ def command(self):
                 print 'Creating write user: SUCCESS'
         elif cmd == 'create-all':
             self.create_db()
-            self.create_write_user()
+            if self.db_ckan_url_parts['db_user'] != self.db_write_url_parts['db_user']:
+                self.create_write_user()
             self.create_read_only_user()
             if self.verbose:
                 print 'Creating db and users for datastore: SUCCESS'