diff --git a/src/Command/CreateRiderAPIUserCommand.php b/src/Command/CreateRiderAPIUserCommand.php
index 6eefdf12..96508fd8 100644
--- a/src/Command/CreateRiderAPIUserCommand.php
+++ b/src/Command/CreateRiderAPIUserCommand.php
@@ -53,6 +53,10 @@ class CreateRiderAPIUserCommand extends Command
 
         foreach ($riders as $rider)
         {
+            // skip riders who already have users
+            if ($rider->getAPIUser() != null)
+                continue;
+
             // create api user for each rider
             // no need to generate the keys. 
             // Secret and API keys are generated in constructor
@@ -62,7 +66,7 @@ class CreateRiderAPIUserCommand extends Command
             $api_user->setEnabled(true);
 
             // set name to rider's last name + first name
-            $rider_name = $rider->getLastName() . '_' . $rider->getFirstName();
+            $rider_name = $rider->getFirstName() . ' ' . $rider->getLastName();
             $api_user->setName($rider_name);
 
             // set rider to api_user