diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
index d368cce20..d55039906 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
@@ -89,7 +89,6 @@ open class SourceManager(private val context: Context) {
     )
 
     private fun createEHSources(): List<Source> {
-        //TODO Fix and hook up to createSources...
         val exSrcs = mutableListOf(
                 EHentai(EH_SOURCE_ID, false, context),
                 EHentaiMetadata(EH_METADATA_SOURCE_ID, false, context)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 3ab75713e..8bde9bf74 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -94,9 +94,10 @@ class MainActivity : BaseActivity() {
 
         if (savedState == null) {
             //Show lock
-            if(lockEnabled(preferences)) {
+            val lockEnabled = lockEnabled(preferences)
+            if(lockEnabled)
                 showLockActivity(this)
-            }
+
             //Perform source migration
             SourceMigrator().tryMigrationWithDialog(this, {
                 // Set start screen
@@ -122,7 +123,8 @@ class MainActivity : BaseActivity() {
                 UrlMigrator().tryMigration()
 
                 //Check lock security
-                notifyLockSecurity(this)
+                if(lockEnabled)
+                    notifyLockSecurity(this)
             })
         }
     }