diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index f4f39e8..76a4349 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -5,6 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
index 7c0c2bb..7d3f889 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
@@ -432,7 +432,6 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
                 WritableMap userMap = getUserMap();
                 if (FirestackAuthModule.this.user != null) {
                     final String token = task.getResult().getToken();
-
                     userMap.putString("token", token);
                     userMap.putBoolean("anonymous", false);
                 }
@@ -509,9 +508,10 @@ private WritableMap getUserMap() {
           userMap.putString("email", email);
           userMap.putString("uid", uid);
           userMap.putString("providerId", provider);
+          userMap.putBoolean("emailVerified", user.isEmailVerified());
 
           if (name != null) {
-            userMap.putString("name", name);
+            userMap.putString("displayName", name);
           }
 
           if (photoUrl != null) {
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
index 61cda5d..37aeca3 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
@@ -304,8 +304,12 @@ public String getName() {
   public void enablePersistence(
     final Boolean enable,
     final Callback callback) {
-      FirebaseDatabase.getInstance()
+      try {
+        FirebaseDatabase.getInstance()
           .setPersistenceEnabled(enable);
+      } catch (Throwable t) {
+        Log.e(TAG, "FirebaseDatabase setPersistenceEnabled exception", t);
+      }
 
       WritableMap res = Arguments.createMap();
       res.putString("status", "success");
diff --git a/ios/Firestack/FirestackAuth.m b/ios/Firestack/FirestackAuth.m
index 0eba61c..bcd0919 100644
--- a/ios/Firestack/FirestackAuth.m
+++ b/ios/Firestack/FirestackAuth.m
@@ -25,7 +25,7 @@ @implementation FirestackAuth
          if (!user) {
              NSDictionary *evt = @{
                                    @"eventName": AUTH_ANONYMOUS_ERROR_EVENT,
-                                   @"msg": [error localizedDescription]
+                                   @"errorMessage": [error localizedDescription]
                                    };
 
 
@@ -41,7 +41,7 @@ @implementation FirestackAuth
     } @catch(NSException *ex) {
         NSDictionary *eventError = @{
                                      @"eventName": AUTH_ANONYMOUS_ERROR_EVENT,
-                                     @"msg": ex.reason
+                                     @"errorMessage": ex.reason
                                      };
         
         [self sendJSEvent:AUTH_ERROR_EVENT
@@ -144,14 +144,15 @@ @implementation FirestackAuth
                                              sendJSEvent:AUTH_CHANGED_EVENT
                                              props: @{
                                                       @"eventName": @"userTokenError",
-                                                      @"msg": [error localizedFailureReason]
+                                                      @"authenticated": @((BOOL)true),
+                                                      @"errorMessage": [error localizedFailureReason]
                                                       }];
                                         } else {
                                             [self
                                              sendJSEvent:AUTH_CHANGED_EVENT
                                              props: @{
                                                       @"eventName": @"user",
-                                                      @"authenticated": @(true),
+                                                      @"authenticated": @((BOOL)true),
                                                       @"user": userProps
                                                       }];
                                         }
@@ -164,7 +165,7 @@ @implementation FirestackAuth
             [self sendJSEvent:AUTH_CHANGED_EVENT
                         props:@{
                                 @"eventName": @"no_user",
-                                @"authenticated": @(false),
+                                @"authenticated": @((BOOL)false),
                                 @"error": err
                                 }];
         }
@@ -185,7 +186,8 @@ @implementation FirestackAuth
     FIRUser *user = [FIRAuth auth].currentUser;
 
     if (user != nil) {
-        NSDictionary *userProps = [self userPropsFromFIRUser:user];
+        NSMutableDictionary *userProps = [self userPropsFromFIRUser:user];
+        [userProps setValue: @((BOOL)true) forKey: @"authenticated"];
         callback(@[[NSNull null], userProps]);
     } else {
         // No user is signed in.
diff --git a/lib/modules/database.js b/lib/modules/database.js
index f7f91fe..6affe14 100644
--- a/lib/modules/database.js
+++ b/lib/modules/database.js
@@ -514,4 +514,4 @@ export class Database extends Base {
   }
 }
 
-export default Database
\ No newline at end of file
+export default Database