diff --git a/frontend/src/main.js b/frontend/src/main.js
index 07cde29..c353295 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,34 +1,6 @@
 import axios from 'axios'
 
-document.querySelector('#faucetForm').addEventListener('submit', (event) => {
-  event.preventDefault()
-  const form = document.querySelector('#faucetForm')
-  const amount = form.dataset.amount
-  const explorerURL = form.dataset.explorerUrl
-  const account = document.querySelector('#recipientAddress').value
-  const resultEl = document.querySelector('#result')
-  showResult(resultEl)
-  document.querySelector('#result').innerHTML = ` <div class="flex flex-col">
-                                                    <img src="/assets/images/cycle-loader.svg" class="inline-block">
-                                                    <div class="font-mono inline-block text-center mt-4">Adding ${amount} to:<br>
-                                                      <strong class="mt-4 inline-block text-xs">${account}</strong>
-                                                    </div>
-                                                  </div>`
-  axios.post('/account/' + account)
-    .then(function (response) {
-      resultEl.innerHTML = `<strong>Added ${amount}!</strong><br>
-      <br>Transaction: <a class="text-purple font-mono text-xs" href="${explorerURL}/transactions/${response.data.tx_hash}" target="_blank">${response.data.tx_hash}</a><br>
-      <br>Account: <a class="text-purple font-mono text-xs" href="${explorerURL}/account/transactions/${account}" target="_blank">${account}</a>
-      <br>Balance: <strong> ${(response.data.balance / 1000000000000000000)} AE </strong><br>`
-    })
-    .catch(function (error) {
-      resultEl.innerHTML = `Something went wrong. ¯\\_(ツ)_/¯  <br>
-      ${error.response.data.message}<br>
-      Please try again later.`
-      console.log(error)
-    })
-})
-const showResult = function (resultEl) {
+function showResult(resultEl) {
   const className = 'hidden'
   if (resultEl.classList) {
     resultEl.classList.remove('hidden', 'lg:hidden')
@@ -36,3 +8,51 @@ const showResult = function (resultEl) {
     resultEl.className = resultEl.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ')
   }
 }
+
+function passQueryAccountAddressToInput(inputEl) {
+  const urlParams = new URLSearchParams(window.location.search)
+  const address = urlParams.get('address')
+  if (address) {
+    inputEl.value = address
+  }
+}
+
+
+document.addEventListener('DOMContentLoaded', () => {
+  const form = document.querySelector('#faucetForm')
+  const recipientEl = document.querySelector('#recipientAddress')
+  const resultEl = document.querySelector('#result')
+
+  passQueryAccountAddressToInput(recipientEl)
+
+  form.addEventListener('submit', (event) => {
+    event.preventDefault()
+
+    const account = recipientEl.value
+    const amount = form.dataset.amount
+    const explorerURL = form.dataset.explorerUrl
+
+    showResult(resultEl)
+
+    resultEl.innerHTML = `<div class="flex flex-col">
+      <img src="/assets/images/cycle-loader.svg" class="inline-block">
+      <div class="font-mono inline-block text-center mt-4">Adding ${amount} AE to:<br>
+        <strong class="mt-4 inline-block text-xs">${account}</strong>
+      </div>
+    </div>`
+
+    axios.post('/account/' + account)
+      .then(function (response) {
+        resultEl.innerHTML = `<strong>Added ${amount}!</strong><br>
+        <br>Transaction: <a class="text-purple font-mono text-xs" href="${explorerURL}/transactions/${response.data.tx_hash}" target="_blank">${response.data.tx_hash}</a><br>
+        <br>Account: <a class="text-purple font-mono text-xs" href="${explorerURL}/account/transactions/${account}" target="_blank">${account}</a>
+        <br>Balance: <strong> ${(response.data.balance / 1000000000000000000)} AE </strong><br>`
+      })
+      .catch(function (error) {
+        resultEl.innerHTML = `Something went wrong. ¯\\_(ツ)_/¯<br>
+        ${error.response.data.message}<br>
+        Please try again later.`
+        console.log(error)
+      })
+  })
+});