diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index e4bcd7e0..84121cf2 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -131,39 +131,33 @@
 }
 
 if (!$isPI) {
+    echo "
+        <form
+            action=''
+            method='POST'
+            id='piReq'
+            onsubmit='return confirm(\"Are you sure you want to request a PI account?\")'
+        >
+        <input type='hidden' name='form_type' value='pi_request'/>
+    ";
     if ($SQL->accDeletionRequestExists($USER->getUID())) {
+        echo "<input type='submit' value='Request PI Account' disabled />";
         echo "
-            <form
-                action=''
-                method='POST'
-                id='piReq'
-                onsubmit='return confirm(\"Are you sure you want to request a PI account?\")'
-            >
-            <input type='hidden' name='form_type' value='pi_request'/>
-            <input type='submit' value='Request PI Account' disabled />
             <label style='margin-left: 10px'>
-            You cannot request PI Account while you have requested account deletion.
+                You cannot request PI Account while you have requested account deletion.
             </label>
-            </form>
         ";
-    } else {
+    } elseif ($SQL->requestExists($USER->getUID())) {
+        echo "<input type='submit' value='Request PI Account' disabled />";
         echo "
-            <form
-                action=''
-                method='POST'
-                id='piReq'
-                onsubmit='return confirm(\"Are you sure you want to request a PI account?\")'
-            >
-            <input type='hidden' name='form_type' value='pi_request'/>
+            <label style='margin-left: 10px'>
+                Your request has been submitted and is currently pending
+            </label>
         ";
-        if ($SQL->requestExists($USER->getUID())) {
-            echo "<input type='submit' value='Request PI Account' disabled />";
-            echo "<label style='margin-left: 10px'>Your request has been submitted and is currently pending</label>";
-        } else {
-            echo "<input type='submit' value='Request PI Account'/>";
-        }
-        echo "</form>";
+    } else {
+        echo "<input type='submit' value='Request PI Account'/>";
     }
+    echo "</form>";
 }
 ?>
 
@@ -210,7 +204,6 @@
 </select>
 <br>
 <input id='submitLoginShell' type='submit' value='Set Login Shell' />
-<label id='labelSubmitLoginShell'> <!-- value set by JS --> </label>
 </form>
 <hr>