diff --git a/scripts/test_e2e.sh b/scripts/test_e2e.sh
index e4ea26ed5..22edff551 100755
--- a/scripts/test_e2e.sh
+++ b/scripts/test_e2e.sh
@@ -45,11 +45,11 @@ $dockerscripts/moodle-docker-wait-for-app
 $dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
 notify_on_error_exit "e2e failed initializing behat"
 
+print_title "Running e2e tests"
+
 # Run tests
 for tags in "$@"
 do
-    print_title "Running e2e tests ($tags)"
-
     $dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\""
     notify_on_error_exit "Some e2e tests are failing, please review"
 done
diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts
index 2702200bd..e614d1b8b 100644
--- a/src/core/login/pages/credentials/credentials.ts
+++ b/src/core/login/pages/credentials/credentials.ts
@@ -93,16 +93,9 @@ export class CoreLoginCredentialsPage {
     }
 
     /**
-     * View enter.
+     * View destroyed.
      */
-    ionViewDidEnter(): void {
-        this.viewLeft = false;
-    }
-
-    /**
-     * View left.
-     */
-    ionViewDidLeave(): void {
+    ionViewWillUnload(): void {
         this.viewLeft = true;
         this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId);
     }