diff --git a/login.php b/login.php
index b80c5079..a88e5451 100644
--- a/login.php
+++ b/login.php
@@ -176,7 +176,7 @@ if (isset($_POST['login'])) {
             // HTML code for the token input field
             $token_field = "
                     <div class='input-group mb-3'>
-                        <input type='text' class='form-control' placeholder='2FA Token' name='current_code' required autofocus>
+                        <input type='text' class='form-control' placeholder='Enter your 2FA code' name='current_code' required autofocus>
                         <div class='input-group-append'>
                           <div class='input-group-text'>
                             <span class='fas fa-key'></span>
@@ -213,7 +213,7 @@ if (isset($_POST['login'])) {
                 // HTML feedback for incorrect 2FA code
                 $response = "
                       <div class='alert alert-warning'>
-                        Please Enter 2FA Key!
+                        Please Enter 2FA Code!
                         <button class='close' data-dismiss='alert'>&times;</button>
                       </div>";
             }
diff --git a/portal/login.php b/portal/login.php
index 14cf72cd..34bdfee5 100644
--- a/portal/login.php
+++ b/portal/login.php
@@ -116,9 +116,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
                 <?php 
                 echo $_SESSION['login_message'];
                 unset($_SESSION['login_message']);
+                ?>
+                </p>
+            <?php
             }
             ?>
-            </p>
             <form method="post">
                 <div class="input-group mb-3">
                     <input type="text" class="form-control" placeholder="Registered Client Email" name="email" required autofocus>