diff --git a/app/DataMapper/DefaultSettings.php b/app/DataMapper/DefaultSettings.php
index 2a3bbf266a3d..80143ec8682b 100644
--- a/app/DataMapper/DefaultSettings.php
+++ b/app/DataMapper/DefaultSettings.php
@@ -12,6 +12,7 @@
 namespace App\DataMapper;
 
 use App\Models\Client;
+use App\Models\User;
 
 /**
  * Class DefaultSettings
@@ -27,21 +28,24 @@ class DefaultSettings extends BaseSettings
 
 	/**
 	 * @return \stdClass
+	 *
+	 * //todo user specific settings / preferences.
      */
 	public static function userSettings() : \stdClass
 	{
 		return (object)[
-	        class_basename(Client::class) => self::clientSettings(),
+	        class_basename(User::class) => self::userSettings(),
 	    ];
 	}
 
 	/**
 	 * @return \stdClass
      */
-	private static function clientSettings() : \stdClass
+	private static function userSettings() : \stdClass
 	{
 		
 		return (object)[
+			'per_page' => self::$per_page,
 		];
 
 	}
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 7d3e6a10b03e..ff87a5a237a8 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -54,9 +54,9 @@ class CreateUser
      */
     public function handle() : ?User
     {
-        $x = mt_rand(1,10000);//todo
+      //  $x = mt_rand(1,10000);//todo
         
-        $email = 'turbo124+'. $x .'@gmail.com'; //todo
+      //  $email = 'turbo124+'. $x .'@gmail.com'; //todo
 
         $user = new User();
        // $user->account_id = $this->account->id;
@@ -64,7 +64,7 @@ class CreateUser
         $user->accepted_terms_version = config('ninja.terms_version');
         $user->confirmation_code = $this->createDbHash(config('database.default'));
         $user->fill($this->request);
-        $user->email = $email;//todo need to remove this in production
+        $user->email = $this->request(['email']);//todo need to remove this in production
         $user->save();
 
         $user->companies()->attach($this->company->id, [