diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 8bd45171..573cb1a6 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -49,12 +49,12 @@
 
             if (!empty($added_keys)) {
                 $added_keys = UnitySite::removeTrailingWhitespace($added_keys);
-                $totalKeys = array_merge($USER->getSSHKeys(), $added_keys);
+                $totalKeys = array_merge($USER->getSSHKeys(true), $added_keys);
                 $USER->setSSHKeys($totalKeys, $OPERATOR);
             }
             break;
         case "delKey":
-            $keys = $USER->getSSHKeys();
+            $keys = $USER->getSSHKeys(true);
             $indexStr = $_POST["delIndex"];
             if (!preg_match("/^[0-9]+$/", $indexStr)) {
                 break;
@@ -83,7 +83,7 @@
             }
             break;
         case "account_deletion_request":
-            $hasGroups = count($USER->getGroups()) > 0;
+            $hasGroups = count($USER->getGroups(true)) > 0;
             if ($hasGroups) {
                 break;
             }
@@ -103,9 +103,9 @@
 <p>
     <strong>Username</strong> <code><?php echo $USER->getUID(); ?></code>
     <br>
-    <strong>Organization</strong> <code><?php echo $USER->getOrg(); ?></code>
+    <strong>Organization</strong> <code><?php echo $USER->getOrg(true); ?></code>
     <br>
-    <strong>Email</strong> <code><?php echo $USER->getMail(); ?></code>
+    <strong>Email</strong> <code><?php echo $USER->getMail(true); ?></code>
 </p>
 
 <hr>
@@ -114,7 +114,7 @@
 
 <?php
 
-$isActive = count($USER->getGroups()) > 0;
+$isActive = count($USER->getGroups(true)) > 0;
 $isPI = $USER->isPI();
 
 if ($isPI) {
@@ -160,7 +160,7 @@
 
 <h5>SSH Keys</h5>
 <?php
-$sshPubKeys = $USER->getSSHKeys();  // Get ssh public key attr
+$sshPubKeys = $USER->getSSHKeys(true);  // Get ssh public key attr
 
 if (count($sshPubKeys) == 0) {
     echo "<p>You do not have any SSH public keys, press the button below to add one.</p>";
@@ -194,7 +194,7 @@
         <option value="" disabled hidden>Select Login Shell...</option>
 
         <?php
-        $cur_shell = $USER->getLoginShell();
+        $cur_shell = $USER->getLoginShell(true);
         $found_selector = false;
         foreach ($CONFIG["loginshell"]["shell"] as $shell) {
             if ($cur_shell == $shell) {
@@ -233,7 +233,7 @@
 
 <h5>Account Deletion</h5>
 <?php
-$hasGroups = count($USER->getGroups()) > 0;
+$hasGroups = count($USER->getGroups(true)) > 0;
 
 if ($hasGroups) {
     echo "<p>You cannot request to delete your account while you are in a PI group.</p>";