diff --git a/administrator/components/com_login/src/Controller/DisplayController.php b/administrator/components/com_login/src/Controller/DisplayController.php
index 6bfb271180718..db93e6ebdb584 100644
--- a/administrator/components/com_login/src/Controller/DisplayController.php
+++ b/administrator/components/com_login/src/Controller/DisplayController.php
@@ -77,26 +77,16 @@ public function login()
 		$credentials = $model->getState('credentials');
 		$return = $model->getState('return');
 
-		$result = $app->login($credentials, array('action' => 'core.login.admin'));
+		$app->login($credentials, array('action' => 'core.login.admin'));
 
-		if ($result && !($result instanceof \Exception))
+		if (Uri::isInternal($return) && strpos($return, 'tmpl=component') === false)
 		{
-			// Only redirect to an internal URL.
-			if (Uri::isInternal($return))
-			{
-				// If &tmpl=component - redirect to index.php
-				if (strpos($return, 'tmpl=component') === false)
-				{
-					$app->redirect($return);
-				}
-				else
-				{
-					$app->redirect('index.php');
-				}
-			}
+			$app->redirect($return);
+		}
+		else
+		{
+			$app->redirect('index.php');
 		}
-
-		$this->display();
 	}
 
 	/**