diff --git a/lib/WP_Auth0_Api_Operations.php b/lib/WP_Auth0_Api_Operations.php
index 53ae464a..e4e5617f 100644
--- a/lib/WP_Auth0_Api_Operations.php
+++ b/lib/WP_Auth0_Api_Operations.php
@@ -84,7 +84,7 @@ public function create_wordpress_connection( $app_token, $migration_enabled, $pa
 				'bareConfiguration'            => array(
 					'endpointUrl'    => site_url( 'index.php?a0_action=' ),
 					'migrationToken' => $migration_token,
-					'userNamespace'  => get_auth0_curatedBlogName(),
+					'userNamespace'  => 'DB-' . get_auth0_curatedBlogName(),
 				),
 			);
 
diff --git a/lib/scripts-js/db-get-user.js b/lib/scripts-js/db-get-user.js
index 0574cd76..fdd8d9d9 100644
--- a/lib/scripts-js/db-get-user.js
+++ b/lib/scripts-js/db-get-user.js
@@ -31,9 +31,9 @@ function getByEmail (email, callback) {
 
       var wpUser = JSON.parse(body);
 
-      // Error returned from WordPress, exit.
-      if (wpUser.error) {
-        callback(null);
+      // Error returned from WordPress or no data, exit.
+      if (wpUser.error || ! wpUser.data) {
+        return callback(null);
       }
 
       // Use WordPress profile data to populate Auth0 account.
diff --git a/lib/scripts-js/db-login.js b/lib/scripts-js/db-login.js
index f94dda3a..4269b038 100644
--- a/lib/scripts-js/db-login.js
+++ b/lib/scripts-js/db-login.js
@@ -33,9 +33,9 @@ function login (email, password, callback) {
 
       var wpUser = JSON.parse(body);
 
-      // Error returned from WordPress, exit.
-      if (wpUser.error) {
-        callback(null);
+      // Error returned from WordPress or no data, exit.
+      if (wpUser.error || ! wpUser.data) {
+        return callback(null);
       }
 
       // Use WordPress profile data to populate Auth0 account.
diff --git a/tests/testApiOperations.php b/tests/testApiOperations.php
index 9e0b5d85..7859dbdb 100644
--- a/tests/testApiOperations.php
+++ b/tests/testApiOperations.php
@@ -111,7 +111,7 @@ public function testThatCreateConnectionWithMigrationRequestsCorrectly() {
 		);
 
 		$this->assertEquals(
-			get_auth0_curatedBlogName(),
+			'DB-' . get_auth0_curatedBlogName(),
 			$caught_http['body']['options']['bareConfiguration']['userNamespace']
 		);
 	}