diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 6ff77cbcb51..a50e72949e3 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -79,8 +79,10 @@ const init = () => {
         data[this.name] = this.value;
       });
 
-      $('#token_symbol').val($('#js-token option:selected').text());
-      $('#token_address').val($('#js-token option:selected').val());
+      if ($('#token_address').length) {
+        $('#token_symbol').val($('#js-token option:selected').text());
+        $('#token_address').val($('#js-token option:selected').val());
+      }
 
       if (document.web3network) {
         $('#network').val(document.web3network);
@@ -120,8 +122,13 @@ const init = () => {
       formData.append('reference_url', $('#input-url').val());
       formData.append('admin_address', $('#input-admin_address').val());
       formData.append('contract_owner_address', $('#contract_owner_address').val());
-      formData.append('token_address', $('#token_address').val());
-      formData.append('token_symbol', $('#token_symbol').val());
+      if ($('#token_address').length) {
+        formData.append('token_address', $('#token_address').val());
+        formData.append('token_symbol', $('#token_symbol').val());
+      } else {
+        formData.append('token_address', '0x0000000000000000000000000000000000000000');
+        formData.append('token_symbol', 'Any Token');
+      }
       formData.append('contract_version', $('#contract_version').val());
       formData.append('transaction_hash', $('#transaction_hash').val());
       formData.append('network', $('#network').val());
@@ -151,14 +158,11 @@ const init = () => {
   });
 };
 
-window.addEventListener('dataWalletReady', function(e) {
-  init();
-}, false);
-
 $(document).ready(function() {
 
   $('.select2-selection__choice').removeAttr('title');
-
+  init();
+  changeTokens();
 });
 
 function saveGrant(grantData, isFinal) {
@@ -194,7 +198,7 @@ function saveGrant(grantData, isFinal) {
 
 
 $('#new_button').on('click', function(e) {
-  if (!provider) {
+  if (!provider && $('#token_address').length != 0) {
     e.preventDefault();
     return onConnect().then(() => init());
   }
diff --git a/app/grants/templates/grants/new-whitelabel.html b/app/grants/templates/grants/new-whitelabel.html
index 3d46a181307..e7d9decc44f 100644
--- a/app/grants/templates/grants/new-whitelabel.html
+++ b/app/grants/templates/grants/new-whitelabel.html
@@ -122,19 +122,6 @@ <h5 class="mt-4">Project Information</h5>
 
                 <h5 class="mt-4">Funding Information</h5>
                 <hr>
-                <div class="form__group-horizontal pb-3">
-                  <div class="row">
-                    <div class="col-12 col-md-12">
-                      <label class="font-body">{% trans "Accepted Tokens" %}</label>
-                      <div class="form__select2">
-                        <select class='js-select2' name='denomination' id='js-token'>
-                          <option value="" disabled="disabled" class="loading_tokens">(Loading Tokens from Web3 Wallet)</option>
-                        </select>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
                 <div class="form__group-horizontal pb-3">
                   <label class="font-body" for="input-admin_address">{% trans "Funding Recipient Wallet Address" %}</label>
                   <input type="text" class="form__input form__input-lg " id="input-admin_address" value="" name="admin_address" required placeholder="0x00... or domain.eth"/>
@@ -156,8 +143,6 @@ <h3 class="text-center">
                   <input type="hidden" id="contract_address" name="contract_address" />
                   <input type="hidden" id="contract_owner_address" name="contract_owner_address">
                   <input type="hidden" id="contract_version" name="contract_version" value="2">
-                  <input type="hidden" id="token_address" name="token_address" value="">
-                  <input type="hidden" id="token_symbol" name="token_symbol" value="">
                   <input type="hidden" id="category" name="category" value="">
                   <input type="hidden" id="network" name="network">
                   <input type="hidden" id="trusted_relayer" name="trusted_relayer" value="{{ trusted_relayer }}">