diff --git a/android/app/build.gradle b/android/app/build.gradle
index e897f475..26a38317 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -102,7 +102,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 3000020
+        versionCode 3000021
         versionName "3.0.2"
 
         multiDexEnabled  true
diff --git a/ios/StandardNotes/Info.plist b/ios/StandardNotes/Info.plist
index 218231da..d535448a 100644
--- a/ios/StandardNotes/Info.plist
+++ b/ios/StandardNotes/Info.plist
@@ -71,7 +71,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/package-lock.json b/package-lock.json
index cfd8801b..4674c1a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11746,9 +11746,9 @@
       "integrity": "sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4="
     },
     "standard-file-js": {
-      "version": "0.3.40",
-      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.40.tgz",
-      "integrity": "sha512-1gxRw3MfNLK9tvmzyht77/GGSOwN3la0Z1NrZeAA1+Z8KClngdhulR2SHS1DXT9jwhIC2wcowu/W1R5P8cIhIA=="
+      "version": "0.3.41",
+      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.41.tgz",
+      "integrity": "sha512-K8d26JaUZS9wRuonUQSl+7/3ArfXp3eUCwd+CgqHcgz9nLxdLR+slzjyrdN5VzHz9pZ64imOdYgiARdKnQtN6g=="
     },
     "static-extend": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 0bcab753..2ff1fc51 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "react-navigation-header-buttons": "^2.1.1",
     "regenerator": "^0.13.3",
     "sn-models": "0.1.13",
-    "standard-file-js": "0.3.40"
+    "standard-file-js": "0.3.41"
   },
   "devDependencies": {
     "babel-jest": "^23.6.0",
diff --git a/src/screens/Authentication/Authenticate.js b/src/screens/Authentication/Authenticate.js
index cb1ad4fd..505cec30 100644
--- a/src/screens/Authentication/Authenticate.js
+++ b/src/screens/Authentication/Authenticate.js
@@ -63,6 +63,15 @@ export default class Authenticate extends Abstract {
   }
 
   componentWillUnmount() {
+
+    // Typically there should be no way to exit this window if it doesn't have a cancel option.
+    // However, on Android, you can press the hardware back button to dismiss it. We want to notify
+    // caller that this screen has unmounted
+    let onUnmount = this.getProp("onUnmount");
+    if(onUnmount) {
+      onUnmount();
+    }
+
     super.componentWillUnmount();
     ApplicationState.get().removeStateObserver(this.stateObserver);
   }
diff --git a/src/screens/Root.js b/src/screens/Root.js
index 511d1f26..cd282899 100644
--- a/src/screens/Root.js
+++ b/src/screens/Root.js
@@ -217,10 +217,12 @@ export default class Root extends Abstract {
       onSuccess: () => {
         authProps.onAuthenticate();
         this.authenticationInProgress = false;
-
         if(this.dataLoaded) {
           Sync.get().sync();
         }
+      },
+      onUnmount: () => {
+        this.authenticationInProgress = false;
       }
     });
   }