diff --git a/public/themes/pterodactyl/js/admin/new-server.js b/public/themes/pterodactyl/js/admin/new-server.js
index cf8766356..d52502f33 100644
--- a/public/themes/pterodactyl/js/admin/new-server.js
+++ b/public/themes/pterodactyl/js/admin/new-server.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
     });
 });
 
-var lastActiveBox = null;
+let lastActiveBox = null;
 $(document).on('click', function (event) {
     if (lastActiveBox !== null) {
         lastActiveBox.removeClass('box-primary');
@@ -79,8 +79,8 @@ $('#pNestId').on('change', function (event) {
 });
 
 $('#pEggId').on('change', function (event) {
-    var parentChain = _.get(Pterodactyl.nests, $('#pNestId').val(), null);
-    var objectChain = _.get(parentChain, 'eggs.' + $(this).val(), null);
+    let parentChain = _.get(Pterodactyl.nests, $('#pNestId').val(), null);
+    let objectChain = _.get(parentChain, 'eggs.' + $(this).val(), null);
 
     $('#pDefaultContainer').val(_.get(objectChain, 'docker_image', 'not defined!'));
 
@@ -103,8 +103,8 @@ $('#pEggId').on('change', function (event) {
 
     $('#appendVariablesTo').html('');
     $.each(_.get(objectChain, 'variables', []), function (i, item) {
-        var isRequired = (item.required === 1) ? '<span class="label label-danger">Required</span> ' : '';
-        var dataAppend = ' \
+        let isRequired = (item.required === 1) ? '<span class="label label-danger">Required</span> ' : '';
+        let dataAppend = ' \
             <div class="form-group col-sm-6"> \
                 <label for="var_ref_' + item.id + '" class="control-label">' + isRequired + item.name + '</label> \
                 <input type="text" id="var_ref_' + item.id + '" autocomplete="off" name="environment[' + item.env_variable + ']" class="form-control" value="' + item.default_value + '" /> \
diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php
index 59011aa46..b3418347e 100644
--- a/resources/views/admin/servers/new.blade.php
+++ b/resources/views/admin/servers/new.blade.php
@@ -313,6 +313,19 @@
 
     <script type="application/javascript">
         $(document).ready(function() {
+            <!-- Persist 'Server Owner' select2 -->
+            @if (old('owner_id'))
+                $.ajax({
+                    url: '/admin/users/accounts.json?user_id={{ old('owner_id') }}',
+                    dataType: 'json',
+                }).then(function (data) {
+                    initUserIdSelect([ data ]);
+                });
+            @else
+                initUserIdSelect();
+            @endif
+            <!-- END Persist 'Server Owner' select2 -->
+
             <!-- Persist 'Node' select2 -->
             @if (old('node_id'))
                 $('#pNodeId').val('{{ old('node_id') }}').change();
@@ -337,18 +350,23 @@
             @endif
             <!-- END Persist 'Node' select2 -->
 
-            <!-- Persist 'Server Owner' select2 -->
-            @if (old('owner_id'))
-                $.ajax({
-                    url: '/admin/users/accounts.json?user_id={{ old('owner_id') }}',
-                    dataType: 'json',
-                }).then(function (data) {
-                    initUserIdSelect([ data ]);
-                });
-            @else
-                initUserIdSelect();
+            <!-- Persist 'Nest' select2 -->
+            @if (old('nest_id'))
+                $('#pNestId').val('{{ old('nest_id') }}').change();
+
+                <!-- Persist 'Egg' select2 -->
+                @if (old('egg_id'))
+                    $('#pEggId').val('{{ old('egg_id') }}').change();
+                @endif
+                <!-- END Persist 'Egg' select2 -->
+
+                <!-- Persist 'Data Pack' select2 -->
+                @if (old('pack_id'))
+                    $('#pPackId').val('{{ old('pack_id') }}').change();
+                @endif
+                <!-- END Persist 'Data Pack' select2 -->
             @endif
-            <!-- END Persist 'Server Owner' select2 -->
+            <!-- END Persist 'Nest' select2 -->
         });
     </script>
 @endsection