diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php
index 266f64061c..8735f47e96 100644
--- a/core/authentication/resources/classes/plugins/email.php
+++ b/core/authentication/resources/classes/plugins/email.php
@@ -99,10 +99,6 @@ class plugin_email {
 				$view->assign("login_logo_height", $settings['theme']['login_logo_height']);
 				$view->assign("login_logo_source", $settings['theme']['logo']);
 				$view->assign("button_login", $text['button-login']);
-				if (!empty($_SESSION['username'])) {
-					$view->assign("username", $_SESSION['username']);
-					$view->assign("button_cancel", $text['button-cancel']);
-				}
 
 				//show the views
 				$content = $view->render('username.htm');
diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php
index 97f510f061..b2c891970b 100644
--- a/core/authentication/resources/classes/plugins/totp.php
+++ b/core/authentication/resources/classes/plugins/totp.php
@@ -106,10 +106,6 @@ class plugin_totp {
 				$view->assign("login_logo_source", $settings['theme']['logo']);
 				$view->assign("button_login", $text['button-login']);
 				$view->assign("favicon", $settings['theme']['favicon']);
-				if (!empty($_SESSION['username'])) {
-					$view->assign("username", $_SESSION['username']);
-					$view->assign("button_cancel", $text['button-cancel']);
-				}
 
 				//show the views
 				$content = $view->render('username.htm');
diff --git a/core/authentication/resources/views/username.htm b/core/authentication/resources/views/username.htm
index 600ba3f324..ba2a339ec0 100644
--- a/core/authentication/resources/views/username.htm
+++ b/core/authentication/resources/views/username.htm
@@ -19,10 +19,6 @@
 					</div>
 					<div>
 						<input type='submit' id='btn_login' class='btn' style='width: 100px; margin-top: 15px;' value='{$button_login}' />
-						{if !empty($username)}
-							<br /><br />
-							<a class='login_link' href='{$project_path}/logout.php'>{$button_cancel}</a>
-						{/if}
 					</div>
 				</form>
 			</div>