diff --git a/.gitignore b/.gitignore
index 99ba2aecf..3352c6ad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ node_modules
 _ide_helper.php
 .phpstorm.meta.php
 .php_cs.cache
-public/assets/*
+public/assets/manifest.json
 
 # For local development with docker
 # Remove if we ever put the Dockerfile in the repo
diff --git a/public/assets/pterodactyl.svg b/public/assets/pterodactyl.svg
new file mode 100755
index 000000000..f3582adf2
--- /dev/null
+++ b/public/assets/pterodactyl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 1280"><defs><style>.cls-1{fill:#904a04;}.cls-2{fill:#b26734;}.cls-3{fill:#6d3c0f;}.cls-4{fill:#bd6e35;}.cls-5{fill:#a56032;}.cls-6{fill:#3a3a3a;}.cls-7{fill:#444;}.cls-8{fill:#515151;}.cls-9{fill:#303030;}.cls-10{fill:#aaa;}.cls-11{fill:#a4571f;}.cls-12{fill:#824009;}.cls-13{fill:#3f3f3f;}.cls-14{fill:#cb63d3;}.cls-15{fill:#b25f8c;}.cls-16{fill:#fff;}.cls-17{fill:#91562d;}.cls-18{fill:#232323;}.cls-19{fill:#161616;}.cls-20{fill:#7c441e;}.cls-21{fill:none;}.cls-22{fill:#ffc33e;}</style></defs><title>Artboard 1</title><g id="Layer_1" data-name="Layer 1"><path class="cls-1" d="M921.82,627.73s-2,9.07-2,10.58-52.4-4.53-52.4-4.53l2-16.63Z"/><path class="cls-1" d="M912.81,623.68s-133.07-39.78-190.5-29.2-20.22,41.57-20.22,41.57Z"/><path class="cls-1" d="M385.21,629.24s2,9.07,2,10.58,52.39-4.53,52.39-4.53l-2-16.63Z"/><path class="cls-1" d="M394.22,625.2S527.29,585.41,584.72,596s20.22,41.57,20.22,41.57Z"/><ellipse class="cls-2" cx="661.81" cy="721.44" rx="243.34" ry="123.94"/><path class="cls-2" d="M589.26,603.55,454.74,624.71,368,638l-23.38,24v42.51l4.43,52.9,73.33,26.45,57.09,3.78C462.74,617.52,589.26,603.55,589.26,603.55Z"/><path class="cls-3" d="M522.41,738.07s-27.2-42.32-98.24-19.65,39.3,42.32,39.3,42.32Z"/><path class="cls-3" d="M318.71,1082.18s47-52.34,153.74-60.78c41.82-3.3,32,94.78,32,94.78l71.24-63.61L715,1063.91l56.45,41.57s36.09-89.36,104.91-87.51,110.37,56.44,110.37,56.44l-87.43-276H393.23Z"/><path class="cls-2" d="M780.61,864.53c-28.25,116.39-35.37,236-124.87,236-89.31,0-95.6-107.1-120.18-226.8-22.46-109.4,48.38-182.41,120.18-182.41a131.4,131.4,0,0,1,65.58,18.13C766.57,735.84,798.71,790,780.61,864.53Z"/><path class="cls-4" d="M744.93,895.92c0,84.15-58.69,177.73-102.78,158.55-46.3-20.16-70.81-80-80-167.2-8.77-83.21,44.22-144.88,90.28-144.88S744.93,811.76,744.93,895.92Z"/><path class="cls-2" d="M717.77,602,852.29,623.2,939,636.44l23.38,24v42.51L958,755.82l-73.33,26.45-57.09,3.78C844.29,616,717.77,602,717.77,602Z"/><polygon class="cls-5" points="563.56 608.08 616.06 721.44 669 777 712 717 761.56 608.08 689.56 595.99 619.46 601.18 563.56 608.08"/><path class="cls-6" d="M773.17,783.34s13.81,71.11-13.4,80.18-52.9-58.95-52.9-58.95H649.44l-1.52-36.27,93.71-18.14Z"/><path class="cls-6" d="M541.09,783.34s-13.8,71.11,13.4,80.18,52.9-58.95,52.9-58.95h57.44l1.51-36.27-93.71-18.14Z"/><polygon class="cls-7" points="568.1 797.01 581.7 787.95 587.75 780.39 726.8 780.39 731.33 787.95 743.42 793.99 734.35 751.67 642.16 745.63 580.19 751.67 568.1 797.01"/><path class="cls-8" d="M772.48,760.11s7.55,32.49-15.12,39.26-30.26-40.1-30.26-40.1l16.66-4.58Z"/><path class="cls-8" d="M540.89,760.11S533.33,792.6,556,799.37s30.26-40.1,30.26-40.1l-16.66-4.58Z"/><polygon class="cls-9" points="686.19 732.02 747.96 732.02 773.65 760.74 746.45 762.25 713.19 757.72 687.5 760.74 686.19 732.02"/><polygon class="cls-9" points="628.55 732.02 566.78 732.02 541.09 760.74 568.3 762.25 601.55 757.72 627.24 760.74 628.55 732.02"/><polygon class="cls-8" points="687.5 760.74 625.53 760.74 611.93 732.02 704.13 732.02 687.5 760.74"/><circle class="cls-10" cx="685.99" cy="742.6" r="4.53"/><rect class="cls-10" x="649.71" y="751.67" width="15.11" height="3.02" rx="1"/><path class="cls-6" d="M559.56,793.1a79.75,79.75,0,0,0,9-27.76c.12-1-1.39-1-1.51,0a77.43,77.43,0,0,1-8.75,27c-.46.85.84,1.62,1.31.76Z"/><path class="cls-6" d="M754.31,792.34a77.41,77.41,0,0,1-8.74-27c-.13-1-1.64-1-1.51,0a79.33,79.33,0,0,0,9,27.76c.46.86,1.76.1,1.3-.76Z"/><path class="cls-11" d="M602.82,745.76c-132.25,128.47-160.43,380.45-160.43,380.45s-25.51-114.06-51-118.31c-34-5.67-71.95,69.74-71.95,69.74s34.32-140.44,22-189.87c-11.57-46.59-74.6-117.53-36.82-204.43,0,0,33.58-55,118.44-63,0,0-261.1,79.46,172.81,121.66h14.48Z"/><path class="cls-1" d="M567.57,761.87c-105.22,102.21-126.14,312.31-126.14,312.31s-23.94-90.75-44.23-94.13c-27.05-4.51-59.07,54.76-59.07,54.76s36.2-113.48,19.36-150.34C308.38,777,305.36,747.88,309.93,719.6c0,0,.08-51.55,49.69-73.86,0,0-142.7,76.88,202.53,110.46h11.39Z"/><path class="cls-3" d="M793.68,736.56s27.21-42.32,98.25-19.65-39.3,42.32-39.3,42.32Z"/><path class="cls-11" d="M704.21,744.24C836.46,872.72,864.64,1124.7,864.64,1124.7s25.51-114.07,51-118.32c34-5.66,72,69.75,72,69.75s-34.32-140.44-22-189.87c11.57-46.59,74.6-117.53,36.82-204.44,0,0-33.58-55-118.44-63,0,0,261.1,79.46-172.81,121.66H696.65Z"/><path class="cls-1" d="M739.46,760.36C844.68,862.57,865.6,1072.67,865.6,1072.67s23.93-90.75,44.22-94.14c27.06-4.51,59.08,54.77,59.08,54.77S932.69,919.82,949.53,883c49.12-107.52,52.14-136.59,47.57-164.87,0,0-.08-51.55-49.69-73.86,0,0,142.7,76.88-202.54,110.45H733.49Z"/><path class="cls-5" d="M487,619s21.91,42,107,42c4,0-8.89-6.4-8.89-6.4s-54.91,3.14-89.39-36.34C492,614,487,619,487,619Z"/><polygon class="cls-11" points="382.68 719.43 382.68 758.27 401.54 725.13 382.68 719.43"/><polygon class="cls-11" points="370.89 711.17 370.89 739.25 384.53 715.28 370.89 711.17"/><polygon class="cls-11" points="924.35 717.92 924.35 756.76 905.49 723.62 924.35 717.92"/><polygon class="cls-11" points="936.13 709.65 936.13 737.74 922.5 713.77 936.13 709.65"/><polygon class="cls-12" points="566.97 594.28 563.23 607.64 595.3 608.08 596.81 595.99 566.97 594.28"/><polygon class="cls-12" points="762.51 593.34 761.41 608.33 734.01 603.03 735.87 591.46 762.51 593.34"/><path class="cls-2" d="M613.09,1109c-12.68,37.21-21.62,63.4-41.79,63.4s-41.1-36.76-41.1-76.07,18.34-89.89,38.52-89.89S627.26,1067.41,613.09,1109Z"/><polygon class="cls-2" points="592.69 1188.11 550.72 1184.29 561.64 1152.63 589.21 1151.51 592.69 1188.11"/><path class="cls-11" d="M551.92,1180.8l40.58,5.38L610.91,1232c-45.11-49.36-90.21-7.08-90.21-7.08Z"/><path class="cls-11" d="M554.24,1201.83s-13.69,20.19-9,30.17l15.11-15.08,17.82-15.09Z"/><path class="cls-2" d="M698.85,1101.89c11.18,37.68,15.83,65.09,36,65.09s41.1-36.76,41.1-76.07S757.6,1001,737.43,1001,686.57,1060.49,698.85,1101.89Z"/><polygon class="cls-2" points="713.46 1182.72 755.42 1178.9 744.5 1147.24 716.94 1146.12 713.46 1182.72"/><path class="cls-11" d="M754.22,1175.41l-40.58,5.38-18.4,45.82c45.1-49.36,90.21-7.09,90.21-7.09Z"/><path class="cls-11" d="M748.5,1197.17s13.7,20.19,9,30.17l-15.12-15.09-17.82-15.08Z"/><rect class="cls-13" x="569.61" y="657.45" width="43.83" height="19.65" rx="6.17"/><path class="cls-9" d="M800.74,296.09s0-10.5-21.38-13.65c-8.72-1.29-59.12-.7-59.12-.7l-15.68-34.6s69.52.8,91.42,11.49S813,286,811,303.1"/><path class="cls-9" d="M485.42,316.6s-1.39-10.41,19.43-16.31c8.48-2.4,58.53-8.35,58.53-8.35L583.82,255s-78.21,10.41-98.54,23.84-13.3,29.32-9.12,46"/><path class="cls-2" d="M560.77,567.57c-1.3,4,4.4,10.16,6.51,12.81,16.61,20.85,29.62,44.28,44.26,66.55,6.38,9.71,46.93,69.27,59.36,56.05,21.16-22.5,36.75-50.25,52-77,16-28.08,30.2-57.4,39.11-88.55a8.31,8.31,0,0,0,.46-3.23c-1-8.41-37.28-9.1-44.15-10.15l-20.82-3.2c-1.88-.29-6.68-2-8.53-1.31l-97.35,36.15-19.31,7.17c-2.64,1-9.83,1.41-11.26,4.11A3.76,3.76,0,0,0,560.77,567.57Z"/><polygon class="cls-11" points="574.86 574.98 632.37 665.52 646.49 677.97 664.23 693.47 681.83 675.67 732.15 596.66 758.37 534.08 685.27 523.98 574.86 574.98"/><polyline class="cls-14" points="721.26 601.57 598.84 595.53 630.58 660.52 642.67 672.61 659.29 686.21 669.87 677.14 677.43 669.59 684.99 659.01"/><polygon class="cls-15" points="633.6 643.38 644.18 661.52 657.78 675.12 708.99 629.78 650.23 623.73 633.6 643.38"/><path class="cls-4" d="M671.69,49.44c-4.64.63-9.72,6.23-12,9-32.3,39.35-51.93,87.41-68.9,135.4C581.58,219.94,573,246.3,563,272.17c-9.7,25.24-23.21,49-31.84,74.42-9.77,28.78-13.29,59.55-11.61,89.86,2.42,43.68,8.59,97.89,40.23,131.13,48.62,51.07,83.3,87.35,83.3,87.35l20.67,16.32,21.13-19S741.3,602.16,747.43,580s6.44-20.54,11.63-32.24,13.62-12.48,20-45.08c15.41-78.47-12.25-158.34-39.58-231.26-15.46-41.27-31.89-82.35-42.36-125.16-4.51-18.47-7.89-37.18-11.68-55.81-1.9-9.3-3.88-18.59-6.15-27.81-.8-3.23-1.12-11.16-4.6-12.78A5.4,5.4,0,0,0,671.69,49.44Z"/><path class="cls-2" d="M675.74,50.6c3.58,4.67-1.86,8.25-1.34,13.89q.95,10.23,2.16,20.44,2.52,21.06,6.18,41.95a772.75,772.75,0,0,0,18.84,81.32c21.39,73.88,54.09,146.09,56,223,2,78.41-28.81,154.7-71.79,220.32,46-39.47,79.71-83.64,94.25-152.73,8.09-38.38,4.23-79.54-4.21-117.82-4.13-18.72-13.35-35.66-18.29-53.9-5.41-20-11.93-39.73-18.83-59.28-13.81-39.14-29.25-77.74-40.84-117.63-7.7-26.5-10.21-54.2-16.93-81-.45-1.76-2.47-22.71-9.26-19.26"/><path class="cls-16" d="M594.1,472.41c.74,11.43-7.13,21.25-17.59,21.93s-19.53-8-20.28-19.47,7.66-13.14,18.12-13.82S593.35,461,594.1,472.41Z"/><path class="cls-16" d="M760,462.52c.78,11.94-7.88,22.21-19.33,23s-21.37-8.33-22.14-20.26,8.4-14.1,19.86-14.84S759.21,450.59,760,462.52Z"/><ellipse class="cls-17" cx="622.99" cy="559.47" rx="5.17" ry="10.14" transform="translate(-142.84 220.9) rotate(-18.07)"/><ellipse class="cls-17" cx="695.17" cy="559.47" rx="10.14" ry="5.17" transform="translate(-52.38 1046.75) rotate(-71.93)"/><circle class="cls-18" cx="580.95" cy="482.63" r="7.67"/><circle class="cls-18" cx="735.18" cy="472.41" r="7.75"/><rect class="cls-13" x="775.83" y="376.94" width="27.21" height="120.91" rx="3.69" transform="translate(-26.73 52.17) rotate(-3.72)"/><rect class="cls-19" x="807.48" y="381.52" width="9.07" height="107.31" transform="translate(-26.53 53.63) rotate(-3.72)"/><rect class="cls-19" x="816.62" y="388.28" width="15.11" height="95.22" rx="3" transform="translate(-26.56 54.42) rotate(-3.72)"/><polygon class="cls-9" points="797.4 500.49 796.71 479.33 802.15 469.89 796.76 386.94 787.76 376.92 786.82 373.95 798.79 371.66 806.63 375.69 814.28 493.34 807.13 499.86 797.4 500.49"/><polygon class="cls-9" points="807.93 369.55 812.31 381.38 819.48 491.48 814.67 499.37 828.05 495.47 820.2 374.81 807.93 369.55"/><polygon class="cls-9" points="800.93 295.99 811.24 300.33 816.56 367.06 807.5 368.5 800.93 295.99"/><polygon class="cls-9" points="807.74 369.56 807.68 345.33 820.2 374.81 807.74 369.56"/><rect class="cls-9" x="466.97" y="474.71" width="10.58" height="22.67" rx="2.77" transform="translate(-30.55 31.68) rotate(-3.72)"/><path class="cls-9" d="M465.75,467.54S389.3,690.62,594.51,677.27L599,677l-.88-13.58S430.89,700,472.24,497.41c6.63-32.48-1.87-28.66-1.87-28.66Z"/><rect class="cls-13" x="501.33" y="394.8" width="27.21" height="120.91" rx="3.69" transform="translate(1058.33 876.12) rotate(176.28)"/><rect class="cls-19" x="487.73" y="402.31" width="9.07" height="107.31" transform="translate(1013.08 879.03) rotate(176.28)"/><rect class="cls-19" x="472.74" y="410.65" width="15.11" height="95.22" rx="3" transform="translate(989.32 884.38) rotate(176.28)"/><polygon class="cls-9" points="515.21 518.85 513.16 497.78 506.54 489.12 501.14 406.17 508.76 395.07 509.31 392 497.14 391.28 489.89 396.3 497.55 513.94 505.48 519.48 515.21 518.85"/><polygon class="cls-9" points="487.81 390.37 484.99 402.67 492.15 512.78 497.94 519.97 484.17 517.84 476.32 397.18 487.81 390.37"/><polygon class="cls-9" points="485.6 316.5 476.08 324.14 478.92 389.02 488.1 389.27 485.6 316.5"/><polygon class="cls-9" points="487.99 390.36 484.92 366.33 476.32 397.18 487.99 390.36"/><path class="cls-20" d="M526.29,367.2c7.4-5,17-5.67,25.6-6.74,10-1.22,20-1.81,29.79.8,8.46,2.26,12.08-10.86,3.61-13.12-11.6-3.09-23.42-2.58-35.22-1.05-10.48,1.36-21.66,2.26-30.65,8.36-7.2,4.89-.4,16.68,6.87,11.75Z"/><path class="cls-20" d="M714.85,356.31A78.59,78.59,0,0,1,766,353.26c8.44,2.36,12-10.76,3.61-13.12a90.81,90.81,0,0,0-58.36,3.06c-3.43,1.38-5.76,4.52-4.75,8.36.86,3.24,5,6.13,8.37,4.75Z"/><g id="Glasses"><path class="cls-18" d="M678.15,451.06c-.36-7-13-15.45-28-14.69s-26.76,10.41-26.41,17.43,12-3.51,27.08-4.26S678.5,458.09,678.15,451.06Z"/><ellipse class="cls-16" cx="574.11" cy="443.03" rx="53.17" ry="73.48" transform="translate(-21.53 29.39) rotate(-2.88)"/><ellipse class="cls-16" cx="726.85" cy="435.35" rx="53.17" ry="73.48" transform="translate(-20.95 37.06) rotate(-2.88)"/><path class="cls-21" d="M623.18,443.41l54.44-2.74"/><path class="cls-18" d="M541.67,391.16C533.46,403,528.51,409.42,523,409.7s-10.83-9.8-11.43-21.85,34.53-13.84,40.09-14.12S543.56,388.42,541.67,391.16Z"/><path class="cls-18" d="M751.2,380.62c9.35,11,14.92,16.85,20.48,16.57s9.79-10.83,9.19-22.88-35.75-10.31-41.31-10S749,378.09,751.2,380.62Z"/></g><circle class="cls-18" cx="576.26" cy="485.84" r="18"/><circle class="cls-18" cx="731.99" cy="478.01" r="19.71"/><circle class="cls-16" cx="580.18" cy="494.28" r="4.93"/><circle class="cls-16" cx="727.07" cy="487.72" r="5.4"/><ellipse class="cls-22" cx="518.2" cy="386.11" rx="3.29" ry="1.44" transform="translate(-98.95 194.44) rotate(-19.44)"/><ellipse class="cls-22" cx="774.2" cy="373.11" rx="1.44" ry="3.29" transform="translate(103.54 910.52) rotate(-64.44)"/><path class="cls-12" d="M487,619.64s-5.33-11.84-5.87-15.72c-.13-.92,6.55-1.26,6.55-1.26L496,618Z"/></g></svg>
\ No newline at end of file
diff --git a/resources/scripts/components/auth/ForgotPasswordContainer.tsx b/resources/scripts/components/auth/ForgotPasswordContainer.tsx
index aa6520c0b..38741f7fc 100644
--- a/resources/scripts/components/auth/ForgotPasswordContainer.tsx
+++ b/resources/scripts/components/auth/ForgotPasswordContainer.tsx
@@ -4,6 +4,7 @@ import requestPasswordResetEmail from '@/api/auth/requestPasswordResetEmail';
 import { connect } from 'react-redux';
 import { pushFlashMessage, clearAllFlashMessages } from '@/redux/actions/flash';
 import { httpErrorToHuman } from '@/api/http';
+import LoginFormContainer from '@/components/auth/LoginFormContainer';
 
 type Props = Readonly<{
     pushFlashMessage: typeof pushFlashMessage;
@@ -60,7 +61,7 @@ class ForgotPasswordContainer extends React.PureComponent<Props, State> {
                 <h2 className={'text-center text-neutral-100 font-medium py-4'}>
                     Request Password Reset
                 </h2>
-                <form className={'login-box'} onSubmit={this.handleSubmission}>
+                <LoginFormContainer onSubmit={this.handleSubmission}>
                     <label htmlFor={'email'}>Email</label>
                     <input
                         ref={this.emailField}
@@ -94,7 +95,7 @@ class ForgotPasswordContainer extends React.PureComponent<Props, State> {
                             Return to Login
                         </Link>
                     </div>
-                </form>
+                </LoginFormContainer>
             </div>
         );
     }
diff --git a/resources/scripts/components/auth/LoginCheckpointContainer.tsx b/resources/scripts/components/auth/LoginCheckpointContainer.tsx
index 1f2dd89d2..b4c3efb05 100644
--- a/resources/scripts/components/auth/LoginCheckpointContainer.tsx
+++ b/resources/scripts/components/auth/LoginCheckpointContainer.tsx
@@ -7,6 +7,7 @@ import MessageBox from '@/components/MessageBox';
 import { Link } from 'react-router-dom';
 import loginCheckpoint from '@/api/auth/loginCheckpoint';
 import { httpErrorToHuman } from '@/api/http';
+import LoginFormContainer from '@/components/auth/LoginFormContainer';
 
 type State = Readonly<{
     isLoading: boolean;
@@ -61,7 +62,7 @@ class LoginCheckpointContainer extends React.PureComponent<RouteComponentProps<{
                     Device Checkpoint
                 </h2>
                 <NetworkErrorMessage message={this.state.errorMessage}/>
-                <form className={'login-box'} onSubmit={this.submit}>
+                <LoginFormContainer onSubmit={this.submit}>
                     <MessageBox type={'warning'}>
                         This account is protected with two-factor authentication. A valid authentication token must
                         be provided in order to continue.
@@ -97,7 +98,7 @@ class LoginCheckpointContainer extends React.PureComponent<RouteComponentProps<{
                             Return to Login
                         </Link>
                     </div>
-                </form>
+                </LoginFormContainer>
             </React.Fragment>
         );
     }
diff --git a/resources/scripts/components/auth/LoginContainer.tsx b/resources/scripts/components/auth/LoginContainer.tsx
index f1600ffe0..e111a0305 100644
--- a/resources/scripts/components/auth/LoginContainer.tsx
+++ b/resources/scripts/components/auth/LoginContainer.tsx
@@ -3,6 +3,7 @@ import { Link, RouteComponentProps } from 'react-router-dom';
 import login from '@/api/auth/login';
 import { httpErrorToHuman } from '@/api/http';
 import NetworkErrorMessage from '@/components/NetworkErrorMessage';
+import LoginFormContainer from '@/components/auth/LoginFormContainer';
 
 type State = Readonly<{
     errorMessage?: string;
@@ -61,7 +62,7 @@ export default class LoginContainer extends React.PureComponent<RouteComponentPr
                     Login to Continue
                 </h2>
                 <NetworkErrorMessage message={this.state.errorMessage}/>
-                <form className={'login-box'} onSubmit={this.submit}>
+                <LoginFormContainer onSubmit={this.submit}>
                     <label htmlFor={'username'}>Username or Email</label>
                     <input
                         id={'username'}
@@ -103,7 +104,7 @@ export default class LoginContainer extends React.PureComponent<RouteComponentPr
                             Forgot password?
                         </Link>
                     </div>
-                </form>
+                </LoginFormContainer>
             </React.Fragment>
         );
     }
diff --git a/resources/scripts/components/auth/LoginFormContainer.tsx b/resources/scripts/components/auth/LoginFormContainer.tsx
new file mode 100644
index 000000000..f6f0223c4
--- /dev/null
+++ b/resources/scripts/components/auth/LoginFormContainer.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+
+export default ({ className, ...props }: React.DetailedHTMLProps<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>) => (
+    <form
+        className={'flex items-center justify-center login-box'}
+        {...props}
+        style={{
+            paddingLeft: 0,
+        }}
+    >
+        <div className={'flex-none'}>
+            <img src={'/assets/pterodactyl.svg'} className={'w-64'}/>
+        </div>
+        <div className={'flex-1'}>
+            {props.children}
+        </div>
+    </form>
+);
diff --git a/resources/scripts/components/auth/ResetPasswordContainer.tsx b/resources/scripts/components/auth/ResetPasswordContainer.tsx
index 5e0783630..dd4664b35 100644
--- a/resources/scripts/components/auth/ResetPasswordContainer.tsx
+++ b/resources/scripts/components/auth/ResetPasswordContainer.tsx
@@ -7,6 +7,7 @@ import performPasswordReset from '@/api/auth/performPasswordReset';
 import { httpErrorToHuman } from '@/api/http';
 import { connect } from 'react-redux';
 import { pushFlashMessage, clearAllFlashMessages } from '@/redux/actions/flash';
+import LoginFormContainer from '@/components/auth/LoginFormContainer';
 
 type State = Readonly<{
     email?: string;
@@ -91,7 +92,7 @@ class ResetPasswordContainer extends React.PureComponent<Props, State> {
                     Reset Password
                 </h2>
                 <NetworkErrorMessage message={this.state.errorMessage}/>
-                <form className={'login-box'} onSubmit={this.onSubmit}>
+                <LoginFormContainer onSubmit={this.onSubmit}>
                     <label>Email</label>
                     <input value={this.state.email || ''} disabled={true}/>
                     <div className={'mt-6'}>
@@ -136,7 +137,7 @@ class ResetPasswordContainer extends React.PureComponent<Props, State> {
                             Return to Login
                         </Link>
                     </div>
-                </form>
+                </LoginFormContainer>
             </div>
         );
     }
diff --git a/resources/themes/pterodactyl/templates/auth/core.blade.php b/resources/themes/pterodactyl/templates/auth/core.blade.php
index 6c106020b..0889bb3a6 100644
--- a/resources/themes/pterodactyl/templates/auth/core.blade.php
+++ b/resources/themes/pterodactyl/templates/auth/core.blade.php
@@ -3,7 +3,7 @@
 ])
 
 @section('container')
-    <div class="w-full max-w-xs sm:max-w-sm m-auto mt-8">
+    <div class="w-full max-w-xs sm:max-w-md m-auto mt-8">
         <div id="app"></div>
     </div>
 @endsection