diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index a2f478713..49ac4728f 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -77,7 +77,7 @@
 
     <!-- HELPERS -->
 
-    {% with version="2.3.4.1" %}
+    {% with version="2.3.4.2" %}
 
         <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">
 
diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 53a0d6b1f..0ecb6e36f 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -305,14 +305,16 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
         var websiteOwner = $scope.websiteOwner;
         var WPtitle = $scope.WPtitle;
 
-        if (domain_check == 0) {
-            var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
-            var domainNameCreate = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
-        }
-        if (domain_check == 1) {
+        // if (domain_check == 0) {
+        //     var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
+        //     var domainNameCreate = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
+        // }
+        // if (domain_check == 1) {
+        //
+        //     var domainNameCreate = $scope.own_domainNameCreate;
+        // }
 
-            var domainNameCreate = $scope.own_domainNameCreate;
-        }
+        var domainNameCreate = $scope.domainNameCreate;
 
 
         var WPUsername = $scope.WPUsername;
@@ -530,6 +532,8 @@ function create_staging_checkbox_function() {
     // alert(domain_check);
 }
 
+create_staging_checkbox_function();
+
 app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $window) {
 
     var CheckBoxpasssword = 0;
@@ -2442,14 +2446,15 @@ app.controller('createWebsite', function ($scope, $http, $timeout, $window) {
 
         var package = $scope.packageForWebsite;
 
-        if (website_create_domain_check == 0) {
-            var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
-            var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
-        }
-        if (website_create_domain_check == 1) {
-
-            var domainName = $scope.own_domainNameCreate;
-        }
+        // if (website_create_domain_check == 0) {
+        //     var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
+        //     var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
+        // }
+        // if (website_create_domain_check == 1) {
+        //
+        //     var domainName = $scope.domainNameCreate;
+        // }
+        var domainName = $scope.domainNameCreate;
 
         // var domainName = $scope.domainNameCreate;
 
@@ -4557,15 +4562,15 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) {
         }
         var package = $scope.packageForWebsite;
 
-        if (website_child_domain_check == 0) {
-            var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
-            var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
-        }
-        if (website_child_domain_check == 1) {
-
-            var domainName = $scope.own_domainNameCreate;
-        }
-
+        // if (website_child_domain_check == 0) {
+        //     var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
+        //     var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
+        // }
+        // if (website_child_domain_check == 1) {
+        //
+        //     var domainName = $scope.own_domainNameCreate;
+        // }
+        var domainName = $scope.domainNameCreate;
 
         var data = {
             domainName: domainName,
diff --git a/websiteFunctions/templates/websiteFunctions/WPCreate.html b/websiteFunctions/templates/websiteFunctions/WPCreate.html
index 643420e70..3958fc76c 100644
--- a/websiteFunctions/templates/websiteFunctions/WPCreate.html
+++ b/websiteFunctions/templates/websiteFunctions/WPCreate.html
@@ -136,113 +136,113 @@
 
                         </div>
 
-                        {#                        <div ng-hide="installationDetailsForm" class="form-group">#}
-                        {#                            <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
-                        {#                            <div class="col-sm-6">#}
-                        {#                                <input name="dom" type="text" class="form-control" ng-model="domainNameCreate"#}
-                        {#                                       placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>#}
-                        {#                            </div>#}
-                        {#                            <div ng-show="websiteCreationForm.dom.$error.pattern"#}
-                        {#                                 class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
-                        {#                        </div>#}
+                        <div ng-hide="installationDetailsForm" class="form-group">
+                            <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
+                            <div class="col-sm-6">
+                                <input name="dom" type="text" class="form-control" ng-model="domainNameCreate"
+                                       placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
+                            </div>
+                            <div ng-show="websiteCreationForm.dom.$error.pattern"
+                                 class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
+                        </div>
 
 
                         {#                     My Work #}
-                        <div ng-hide="installationDetailsForm" class="form-group">
-                            <label class="col-sm-3 control-label"
-                                   style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
-                            <label class="switch">
-                                <input type="checkbox" checked id="myCheck" onclick="checkbox_function()"
-                                       style="margin-top: 10px">
-                                <span class="slider"></span>
-                            </label>
-                            <label id="help">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
-                                     preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
-                                    <path fill="currentColor"
-                                          d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
-                                    <path fill="currentColor"
-                                          d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
-                                </svg>
-
-                            </label>
-                            <label class="help_test_domain">
-                                The test domain allows you to deploy websites without the need to add DNS records, it
-                                allows you to create staging environments, deploy test websites, and much more...
-
-                            </label>
-
-
-                            <br><br>
-
-
-                            <div id="Test_Domain" class="tabcontent" style="border: none;margin-left: 10px; position: relative">
-                                <div ng-hide="installationDetailsForm" class="form-group"
-                                     ng-if="{{ test_domain_data }} == 1 ">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input id="TestDomainNameCreate"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Enter Subdomain Here" %}">
-
-                                            <span style="width: 48%" class="input-group-btn">
-                                        <input id="Part2_domainNameCreate" class="form-control"
-                                               type="text" name="Part2_domainNameCreate"
-                                               style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
-                                               placeholder=".{{ Randam_String }}.cyberpanel.website"
-                                               value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
-                                        </div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                                <div ng-if="{{ test_domain_data }} == 0 ">
-                                    <center>Looks like you have not subscribed to temporary domain feature,<a
-                                            href="https://go.cyberpanel.net/TempDomain">click here</a>
-                                        for more details.
-                                    </center>
-                                </div>
-                            </div>
-
-                            <div id="Own_Domain" class="tabcontent"
-                                 style="border: none;display: none;margin-left: 10px;position: relative">
-
-                                <div ng-hide="installationDetailsForm" class="form-group">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input ng-model="own_domainNameCreate" id="touchspin-demo-1"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
-                                            <span class="input-group-addon bootstrap-touchspin-postfix">/</span>
-                                            <span style="width: 25%" class="input-group-btn">
-                                        <input id="touchspin-demo-1" class="form-control"
-                                               placeholder="{% trans "Leave empty for default" %}"
-                                               type="text" value="Leave empty for default"
-                                               name="touchspin-demo-1" ng-model="installPath"
-                                               style="display: block;"></span>
-
-                                        </div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                            </div>
-
-                        </div>
+{#                        <div ng-hide="installationDetailsForm" class="form-group">#}
+{#                            <label class="col-sm-3 control-label"#}
+{#                                   style="margin-bottom: 15px">{% trans "Test Domain" %}</label>#}
+{#                            <label class="switch">#}
+{#                                <input type="checkbox" checked id="myCheck" onclick="checkbox_function()"#}
+{#                                       style="margin-top: 10px">#}
+{#                                <span class="slider"></span>#}
+{#                            </label>#}
+{#                            <label id="help">#}
+{#                                <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"#}
+{#                                     preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">#}
+{#                                    <path fill="currentColor"#}
+{#                                          d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>#}
+{#                                    <path fill="currentColor"#}
+{#                                          d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>#}
+{#                                </svg>#}
+{##}
+{#                            </label>#}
+{#                            <label class="help_test_domain">#}
+{#                                The test domain allows you to deploy websites without the need to add DNS records, it#}
+{#                                allows you to create staging environments, deploy test websites, and much more...#}
+{##}
+{#                            </label>#}
+{##}
+{##}
+{#                            <br><br>#}
+{##}
+{##}
+{#                            <div id="Test_Domain" class="tabcontent" style="border: none;margin-left: 10px; position: relative">#}
+{#                                <div ng-hide="installationDetailsForm" class="form-group"#}
+{#                                     ng-if="{{ test_domain_data }} == 1 ">#}
+{#                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
+{#                                    <div class="col-sm-6">#}
+{#                                        <div class="input-group bootstrap-touchspin">#}
+{#                                    <span#}
+{#                                            class="input-group-addon bootstrap-touchspin-prefix"#}
+{#                                            style="display: none;"></span>#}
+{#                                            <input id="TestDomainNameCreate"#}
+{#                                                   class="form-control"#}
+{#                                                   type="text" value=""#}
+{#                                                   name="touchspin-demo-1"#}
+{#                                                   style="display: block;"#}
+{#                                                   placeholder="{% trans "Enter Subdomain Here" %}">#}
+{##}
+{#                                            <span style="width: 48%" class="input-group-btn">#}
+{#                                        <input id="Part2_domainNameCreate" class="form-control"#}
+{#                                               type="text" name="Part2_domainNameCreate"#}
+{#                                               style="display: block;color: black;font-weight: bold;color: black;opacity: 1"#}
+{#                                               placeholder=".{{ Randam_String }}.cyberpanel.website"#}
+{#                                               value=".{{ Randam_String }}.cyberpanel.website" readonly></span>#}
+{#                                        </div>#}
+{#                                    </div>#}
+{#                                    <div ng-show="websiteCreationForm.dom.$error.pattern"#}
+{#                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
+{#                                </div>#}
+{#                                <div ng-if="{{ test_domain_data }} == 0 ">#}
+{#                                    <center>Looks like you have not subscribed to temporary domain feature,<a#}
+{#                                            href="https://go.cyberpanel.net/TempDomain">click here</a>#}
+{#                                        for more details.#}
+{#                                    </center>#}
+{#                                </div>#}
+{#                            </div>#}
+{##}
+{#                            <div id="Own_Domain" class="tabcontent"#}
+{#                                 style="border: none;display: none;margin-left: 10px;position: relative">#}
+{##}
+{#                                <div ng-hide="installationDetailsForm" class="form-group">#}
+{#                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
+{#                                    <div class="col-sm-6">#}
+{#                                        <div class="input-group bootstrap-touchspin">#}
+{#                                    <span#}
+{#                                            class="input-group-addon bootstrap-touchspin-prefix"#}
+{#                                            style="display: none;"></span>#}
+{#                                            <input ng-model="own_domainNameCreate" id="touchspin-demo-1"#}
+{#                                                   class="form-control"#}
+{#                                                   type="text" value=""#}
+{#                                                   name="touchspin-demo-1"#}
+{#                                                   style="display: block;"#}
+{#                                                   placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">#}
+{#                                            <span class="input-group-addon bootstrap-touchspin-postfix">/</span>#}
+{#                                            <span style="width: 25%" class="input-group-btn">#}
+{#                                        <input id="touchspin-demo-1" class="form-control"#}
+{#                                               placeholder="{% trans "Leave empty for default" %}"#}
+{#                                               type="text" value="Leave empty for default"#}
+{#                                               name="touchspin-demo-1" ng-model="installPath"#}
+{#                                               style="display: block;"></span>#}
+{##}
+{#                                        </div>#}
+{#                                    </div>#}
+{#                                    <div ng-show="websiteCreationForm.dom.$error.pattern"#}
+{#                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
+{#                                </div>#}
+{#                            </div>#}
+{##}
+{#                        </div>#}
                         {#                          My Work End#}
                         {#                    #}
                         <div ng-hide="installationDetailsForm" class="form-group">
diff --git a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
index 229b1fa8c..65032cdb6 100644
--- a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
+++ b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
@@ -393,16 +393,16 @@
                                 <div ng-hide="stagingDetailsForm" class="form-group">
 
                                     <div ng-hide="installationDetailsForm" class="form-group">
-                                        <label class="col-sm-2 control-label" style="margin-top: 10px"
-                                               style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
-                                        <label class="switch ">
-                                            <input type="checkbox" checked id="Create_Staging_Check"
+                                        <label class="col-sm-2 control-label" style="margin-top: 10px; display: none"
+                                               style="margin-bottom: 15px; display: none">{% trans "Test Domain" %}</label>
+                                        <label style="display: none" class="switch ">
+                                            <input type="checkbox" id="Create_Staging_Check"
                                                    onclick="create_staging_checkbox_function()"
                                                    style="margin-top: 10px">
                                             <span class="slider"></span>
                                         </label>
 
-                                        <label id="help">
+                                        <label style=" display: none" id="help">
                                             <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25"
                                                  style="padding-top: 10px"
                                                  preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
@@ -487,8 +487,8 @@
 
                                     </div>
                                 </div>
-{#                                end my work#}
-                                <div ng-hide="stagingDetailsForm" class="center-div mt-5 " >
+                                {#                                end my work#}
+                                <div ng-hide="stagingDetailsForm" class="center-div mt-5 ">
                                     <button ng-click="CreateStagingNow()"
                                             style="margin-bottom: 2%!important;margin-top: 50px"
                                             class="btn btn-alt btn-hover btn-blue-alt">
diff --git a/websiteFunctions/templates/websiteFunctions/createDomain.html b/websiteFunctions/templates/websiteFunctions/createDomain.html
index 733e52f8a..8691e282e 100755
--- a/websiteFunctions/templates/websiteFunctions/createDomain.html
+++ b/websiteFunctions/templates/websiteFunctions/createDomain.html
@@ -140,95 +140,11 @@
                         {#                    My Work    .    #}
 
                         <div ng-hide="DomainCreateForm" class="form-group">
-                            <label class="col-sm-3 control-label"
-                                   style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
-                            <label class="switch my-3">
-                                <input type="checkbox" checked id="myCheck"
-                                       onclick="website_child_domain_checkbox_function()"
-                                       style="margin-top: 10px">
-                                <span class="slider"></span>
-                            </label>
-
-                            <label id="help">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
-                                     preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
-                                    <path fill="currentColor"
-                                          d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
-                                    <path fill="currentColor"
-                                          d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
-                                </svg>
-
-                            </label>
-                            <label class="help_test_domain">
-                                The test domain allows you to deploy websites without the need to add DNS records, it
-                                allows you to create staging environments, deploy test websites, and much more...
-
-                            </label>
-                            <br><br>
-
-
-                            <div id="Website_Create_Test_Domain" class="tabcontent"
-                                 style="border: none;margin-left: 10px">
-                                <div ng-hide="DomainCreateForm" class="form-group"
-                                     ng-if="{{ test_domain_data }} == 1 ">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input id="TestDomainNameCreate"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Enter Subdomain Here" %}">
-
-                                            <span style="width: 48%" class="input-group-btn">
-                                        <input id="Part2_domainNameCreate" class="form-control"
-                                               type="text" name="Part2_domainNameCreate"
-                                               style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
-                                               placeholder=".{{ Randam_String }}.cyberpanel.website"
-                                               value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
-                                        </div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                                <div ng-if="{{ test_domain_data }} == 0 ">
-                                    <center>Looks like you have not subscribed to temporary domain feature, <a
-                                            href="https://go.cyberpanel.net/TempDomain">click here</a>
-                                        for more details.
-                                    </center>
-                                </div>
+                            <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
+                            <div class="col-sm-6">
+                                <input name="dom" type="text" class="form-control"
+                                       ng-model="domainNameCreate" required>
                             </div>
-
-                            <div id="Website_Create_Own_Domain" class="tabcontent"
-                                 style="border: none;display: none;margin-left: 10px">
-
-                                <div ng-hide="DomainCreateForm" class="form-group">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input ng-model="own_domainNameCreate" id="touchspin-demo-1"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
-
-                                            <span style="width: 25%" class="input-group-btn">
-                                       </span></div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                            </div>
-
-
                         </div>
                         <div ng-hide="DomainCreateForm" class="form-group">
                             <label class="col-sm-3 control-label">{% trans "Path" %}: /home/{$ masterDomain
diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html
index 1e3dc9e82..18044b814 100755
--- a/websiteFunctions/templates/websiteFunctions/createWebsite.html
+++ b/websiteFunctions/templates/websiteFunctions/createWebsite.html
@@ -130,98 +130,15 @@
                             </div>
                         </div>
 
-                        {#                     My Work #}
                         <div ng-hide="installationDetailsForm" class="form-group">
-                            <label class="col-sm-3 control-label"
-                                   style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
-                            <label class="switch my-3">
-                                <input type="checkbox" checked id="myCheck" onclick="website_create_checkbox_function()"
-                                       style="margin-top: 10px">
-                                <span class="slider"></span>
-                            </label>
-
-                            <label id="help">
-                                <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
-                                     preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
-                                    <path fill="currentColor"
-                                          d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
-                                    <path fill="currentColor"
-                                          d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
-                                </svg>
-
-                            </label>
-                            <label class="help_test_domain">
-                                The test domain allows you to deploy websites without the need to add DNS records, it
-                                allows you to create staging environments, deploy test websites, and much more...
-
-                            </label>
-                            <br><br>
-
-
-                            <div id="Website_Create_Test_Domain" class="tabcontent"
-                                 style="border: none;margin-left: 10px">
-                                <div ng-hide="installationDetailsForm" class="form-group"
-                                     ng-if="{{ test_domain_data }} == 1 ">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input id="TestDomainNameCreate"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Enter Subdomain Here" %}">
-
-                                            <span style="width: 48%" class="input-group-btn">
-                                        <input id="Part2_domainNameCreate" class="form-control"
-                                               type="text" name="Part2_domainNameCreate"
-                                               style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
-                                               placeholder=".{{ Randam_String }}.cyberpanel.website"
-                                               value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
-                                        </div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                                <div ng-if="{{ test_domain_data }} == 0 ">
-                                    <center>Looks like you have not subscribed to temporary domain feature, <a
-                                            href="https://go.cyberpanel.net/TempDomain">click here</a>
-                                        for more details.
-                                    </center>
-                                </div>
+                            <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
+                            <div class="col-sm-6">
+                                <input name="dom" type="text" class="form-control" ng-model="domainNameCreate"
+                                       placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
                             </div>
-
-                            <div id="Website_Create_Own_Domain" class="tabcontent"
-                                 style="border: none;display: none;margin-left: 10px">
-
-                                <div ng-hide="installationDetailsForm" class="form-group">
-                                    <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <div class="input-group bootstrap-touchspin">
-                                    <span
-                                            class="input-group-addon bootstrap-touchspin-prefix"
-                                            style="display: none;"></span>
-                                            <input ng-model="own_domainNameCreate" id="touchspin-demo-1"
-                                                   class="form-control"
-                                                   type="text" value=""
-                                                   name="touchspin-demo-1"
-                                                   style="display: block;"
-                                                   placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
-
-                                            <span style="width: 25%" class="input-group-btn">
-                                       </span></div>
-                                    </div>
-                                    <div ng-show="websiteCreationForm.dom.$error.pattern"
-                                         class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
-                                </div>
-                            </div>
-
+                            <div ng-show="websiteCreationForm.dom.$error.pattern"
+                                 class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
                         </div>
-                        {#                          My Work End#}
-                        {#                    #}
 
                         <div ng-hide="installationDetailsForm" class="form-group">
                             <label class="col-sm-3 control-label">{% trans "Email" %}</label>