diff --git a/content/template/myPagesTemplate/login.php b/content/template/myPagesTemplate/login.php
index a2815b3d..f665cbac 100644
--- a/content/template/myPagesTemplate/login.php
+++ b/content/template/myPagesTemplate/login.php
@@ -19,11 +19,7 @@
 		require_once 'profile.php';
 	}
 } else {
-	if ( isset( $q['edu-login'] ) ) {
-		require_once 'login-page.php';
-	} else {
-		require_once 'login-page.php';
-	}
+	require_once 'login-page.php';
 }
 
 $out = ob_get_clean();
diff --git a/includes/edu-shortcodes.php b/includes/edu-shortcodes.php
index abb94f96..d50484dd 100644
--- a/includes/edu-shortcodes.php
+++ b/includes/edu-shortcodes.php
@@ -658,12 +658,11 @@ function eduadmin_get_login_view( $attributes ) {
 		normalize_empty_atts( $attributes ),
 		'eduadmin-loginview'
 	);
-	EDU()->stop_timer( $t );
 
-	ob_start();
-	include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
+	$str = include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
+	EDU()->stop_timer( $t );
 
-	return ob_get_clean();
+	return $str;
 }
 
 function eduadmin_get_programme_list( $attributes ) {