diff --git a/client/modules/User/components/APIKeyForm.jsx b/client/modules/User/components/APIKeyForm.jsx
index 17ea1542..bffd0ffc 100644
--- a/client/modules/User/components/APIKeyForm.jsx
+++ b/client/modules/User/components/APIKeyForm.jsx
@@ -44,7 +44,7 @@ function TokenMetadataList({ tokens, onRemove }) {
           );
 
           const newKeyValue = v.token && (
-            <tr key={v.id}>
+            <tr key={`${v.id}-newKey`}>
               <td colSpan="4">
                 <NewTokenDisplay token={v.token} />
               </td>
diff --git a/client/modules/User/pages/AccountView.jsx b/client/modules/User/pages/AccountView.jsx
index bac59dbd..9cf18eb8 100644
--- a/client/modules/User/pages/AccountView.jsx
+++ b/client/modules/User/pages/AccountView.jsx
@@ -38,7 +38,7 @@ class AccountView extends React.Component {
 
   render() {
     return (
-      <section className="account form-container">
+      <section className="form-container form-container--align-top">
         <Helmet>
           <title>p5.js Web Editor | Account</title>
         </Helmet>
diff --git a/client/styles/components/_form-container.scss b/client/styles/components/_form-container.scss
index 669edf8e..743aad21 100644
--- a/client/styles/components/_form-container.scss
+++ b/client/styles/components/_form-container.scss
@@ -6,6 +6,10 @@
   align-items: center;
 }
 
+.form-container--align-top {
+  height: unset;
+}
+
 .form-container__header {
 	width: 100%;
 	padding: #{15 / $base-font-size}rem #{34 / $base-font-size}rem;