diff --git a/core/authentication/resources/views/login.htm b/core/authentication/resources/views/login.htm
index a2809409e8..4ea057ccfc 100644
--- a/core/authentication/resources/views/login.htm
+++ b/core/authentication/resources/views/login.htm
@@ -92,16 +92,12 @@
 						{/if}
 					</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}
-						-->
-						<br />
+						<input type='submit' id='btn_login' class='btn' style='width: 100px; margin-top: 15px;' value='{$button_login}' /><br />
 						{if !empty($login_password_reset_enabled) && $login_password_reset_enabled}
-						<a class='login_link' class='btn' href='{$project_path}/resources/login.php?action=request'>{$button_forgot_password}</a>
+							<a class='login_link' style='display: inline-block; margin-top: 15px;' href='{$project_path}/resources/login.php?action=request'>{$button_forgot_password}</a><br />
+						{/if}
+						{if !empty($username)}
+							<a class='login_link' style='display: inline-block; margin-top: 15px;' href='{$project_path}/logout.php'>{$button_cancel}</a>
 						{/if}
 					</div>
 				</form>